Update all catalogs

28 files changed, 26718 insertions, 16969 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 5a3898ba..ff23d771 100644
--- a/docs/installer/ca.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2017-01-22 20:30+0000\n"
 "Last-Translator: Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -185,35 +185,29 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestió d'usuaris i superusuari"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -234,7 +228,7 @@ msgstr ""
 "comparació que no heu teclejat malament la primera contrasenya."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -244,12 +238,12 @@ msgstr ""
 "nombres i altres caràcters."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Introduïu un usuari"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -261,7 +255,7 @@ msgstr ""
 "el seu ordinador."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -269,14 +263,14 @@ msgstr ""
 "<guibutton>Icona</guibutton>: si hi cliqueu, canviarà la icona d'usuari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users 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:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -288,7 +282,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -296,7 +290,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -307,68 +301,52 @@ msgstr ""
 "dues caselles."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Qualsevol usuari que creeu durant la instal·lació de Mageia tindrà un "
 "directori d'usuari llegible per tothom (però protegit contra escriptura)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"No obstant això, quan feu servir la nova instal·lació, tots els usuaris "
-"afegits a <emphasis>MCC- Sistema - Gestiona els usuaris del sistema</"
-"emphasis> tindran el directori d'usuari protegit contra lectura i escriptura."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Si preferiu directoris d'usuari llegibles per tothom, podeu afegir tots els "
 "usuaris suplementaris al pas <emphasis>Configuració - Resum</emphasis> "
 "durant la instal·lació. Trieu <emphasis>Gestió d'usuaris</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Gestió avançada d'usuaris"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -379,7 +357,7 @@ msgstr ""
 "El convidat hauria de desar els fitxers importants en una memòria USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -391,7 +369,7 @@ msgstr ""
 "restringit que els usuaris normals."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -402,7 +380,7 @@ msgstr ""
 "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:153
+#: en/addUser.xml:125
 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 "
@@ -413,7 +391,7 @@ msgstr ""
 "en blanc excepte si sabeu què esteu fent."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -742,12 +720,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Selecció d'escriptori"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -756,7 +734,7 @@ msgstr ""
 "per a afinar la tria."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -767,16 +745,17 @@ msgstr ""
 "clicant el botó <guilabel>Detalls</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -796,22 +775,23 @@ msgstr ""
 "instal·lació predeterminada."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Selecció de grup de paquets"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -823,22 +803,22 @@ msgstr ""
 "ratolí per sobre."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Estació de treball."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Servidor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Entorn gràfic."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -847,10 +827,11 @@ msgstr ""
 "o eliminar paquets individualment."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Llegiu <xref linkend=\"minimal-install\"></xref> per obtenir instruccions de "
 "com fer una instal·lació mínima (sense o amb X &amp; IceWM)."
@@ -1326,20 +1307,24 @@ msgstr ""
 "automàticament. De nou, sigueu prudents en les vostres seleccions."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particionament personalitzat del disc amb DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1352,7 +1337,7 @@ msgstr ""
 "literal>. Altrament, el sistema no arrencarà."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1360,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1370,7 +1355,7 @@ msgstr ""
 "n'hi ha tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1379,7 +1364,7 @@ msgstr ""
 "particions del dispositiu d'emmagatzematge seleccionat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1389,40 +1374,69 @@ msgstr ""
 "muntatge, redimensioneu-la, o bé elimineu-la."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continueu fins que tot sigui del vostre grat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Cliqueu <guibutton>Fet</guibutton> en acabat."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:7
+#: en/doPartitionDisks.xml:9
 msgid "Partitioning"
 msgstr "Particionament"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:10
+#: 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 "
@@ -1433,7 +1447,7 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1442,19 +1456,30 @@ msgstr ""
 "disposició i contingut del(s) vostre(s) disc(s) dur(s) en particular."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Utilitza les particions existents"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1463,12 +1488,12 @@ msgstr ""
 "compatibles amb Linux i es podrien fer servir per a la instal·lació."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Utilitza l'espai lliure"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1477,12 +1502,12 @@ msgstr ""
 "instal·lació de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1491,7 +1516,7 @@ msgstr ""
 "l'instal·lador us proposi utilitzar-la."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1502,7 +1527,7 @@ msgstr ""
 "una còpia de seguretat dels fitxers importants."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1520,7 +1545,7 @@ msgstr ""
 "personals."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1529,30 +1554,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Esborra i utilitza el disc sencer."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Aquesta opció utilitzarà tota la unitat per a Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1562,12 +1595,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:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Personalitzat"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1576,55 +1609,55 @@ msgstr ""
 "al(s) disc(s) dur(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1632,8 +1665,42 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1653,17 +1720,17 @@ msgstr ""
 "alternativa, com ara gparted, i feu servir la configuració següent:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Alinea a\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Espai lliure que precedeix a (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1776,27 +1843,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Enhorabona"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1806,7 +1870,7 @@ msgstr ""
 "és segur treure el suport d'instal·lació i arrencar de nou l'ordinador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1815,7 +1879,7 @@ msgstr ""
 "entre els diversos sistemes operatius instal·lats (si n'hi ha més d'un)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1824,12 +1888,12 @@ msgstr ""
 "automàticament la instal·lació Mageia i s'iniciarà."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Gaudiu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1955,6 +2019,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2541,30 +2610,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resum dels paràmetres diversos"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2576,18 +2631,40 @@ msgstr ""
 "aquí la configuració i canviar-la prement el botó <guibutton>Configura</"
 "guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Paràmetres del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zona horària</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2597,12 +2674,12 @@ msgstr ""
 "cal, ho podeu canviar. Vegeu també <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>País / Regió</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2611,34 +2688,34 @@ msgstr ""
 "configuració. Vegeu <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Gestor d'arrencada</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr "No canvieu res, excepte si sabeu com configurar Grub i/o Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestió d'usuaris</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2647,12 +2724,12 @@ msgstr ""
 "directori <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Serveis</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2662,7 +2739,7 @@ msgstr ""
 "tasques."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2671,22 +2748,22 @@ msgstr ""
 "l'ordinador no funcionés correctament."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Paràmetres del maquinari"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teclat</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2694,13 +2771,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Ratolí</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2709,12 +2793,12 @@ msgstr ""
 "ratolins de bola, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Targeta de so</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2725,42 +2809,44 @@ msgstr ""
 "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:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfície gràfica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Paràmetres de xarxa i Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Xarxa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2773,7 +2859,7 @@ msgstr ""
 "control de Mageia</application>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2782,12 +2868,12 @@ msgstr ""
 "perquè vigili també aquella interfície."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Servidors intermediaris</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2798,7 +2884,7 @@ msgstr ""
 "intermediari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2807,17 +2893,17 @@ msgstr ""
 "paràmetres que cal posar aquí"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Seguretat"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nivell de seguretat</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2827,17 +2913,17 @@ msgstr ""
 "general."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Tallafoc</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -2847,10 +2933,12 @@ msgstr ""
 "les."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Seleccioneu els serveis als quals voleu poder accedir. Les seleccions "
 "dependran de l'ús que es vulgui donar a l'ordinador."
@@ -2862,25 +2950,43 @@ msgstr ""
 "Tingueu present que permetre-ho tot (sense tallafoc) pot ser molt arriscat."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Reinicia"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
@@ -2942,29 +3048,29 @@ msgstr ""
 "de Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Selecció i utilització de les ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introducció"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2973,7 +3079,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2981,22 +3087,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Suport"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definició"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3004,7 +3110,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3013,23 +3119,23 @@ msgstr ""
 "\">aquí</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Suports d'instal·lació clàssics"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Característiques comunes"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr "Aquestes ISOs fan servir l'instal·lador clàssic anomenat drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3037,76 +3143,43 @@ msgstr ""
 "anteriors."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Suports diferents per a arquitectura de 32 ó 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Durant la instal·lació se us oferirà la possibilitat d'afegir programari de "
 "propietat."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD doble arquitectura"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Les dues arquitectures estan presents en el mateix suport, la tria es fa "
-"automàticament en funció de la CPU detectada."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Utilitza només l'escriptori Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"No tots els idiomes estan disponibles. (be, bg, ca, de, en, es, fr, it, mk, "
-"pl, pt, ru, sv, uk) CAL VERIFICAR-HO!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Conté programari de propietat."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Mitjà autònom"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3116,18 +3189,20 @@ msgstr ""
 "dur si ho voleu."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Cada ISO conté només un entorn d'escriptori (KDE o bé GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "Suports diferents per a arquitectura de 32 ó 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3135,63 +3210,57 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Contenen programari de propietat."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "CD autònom de KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "DVD autònom de KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Només entorn d'escriptori KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Només en anglès."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Només 32 bits."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Conté tots els idiomes."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "CD autònom de GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "DVD autònom de GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Només entorn d'escriptori GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "DVD autònom de KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Conté tots els idiomes."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "DVD autònom de GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Només entorn d'escriptori KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Suport CD només d'arrencada"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3200,20 +3269,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "Només en anglès."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3222,12 +3296,13 @@ msgstr ""
 "programari de propietat."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3236,17 +3311,17 @@ msgstr ""
 "qui el necessiti."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Baixada i comprovació del mitjà"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Baixada"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3255,12 +3330,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3268,22 +3343,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Comprovació de la integritat del suport baixat"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3293,12 +3368,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr "Obriu una consola, no cal que sigueu l'usuari primari, i:"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3307,7 +3382,7 @@ msgstr ""
 "cap/a/la/imatge/fitxer.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3316,36 +3391,36 @@ msgstr ""
 "camí/cap/a/la/imatge/fitxer.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Enregistrament o bolcat de l'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Enregistrament de l'ISO a un CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3354,12 +3429,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3369,7 +3444,7 @@ msgstr ""
 "el sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3377,43 +3452,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Podeu provar:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3422,29 +3497,29 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Obriu una consola"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3453,29 +3528,29 @@ msgstr ""
 "oblideu el «-» final)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3483,7 +3558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3507,14 +3582,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3523,12 +3598,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "On X=nom del dispositiu, per exemple: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3537,37 +3612,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Desconnecteu el llapis de memòria USB, ja està"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Selecció de país / regió"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3576,7 +3651,7 @@ msgstr ""
 "trieu un país equivocat, potser no podreu fer anar la xarxa sense fil."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3585,7 +3660,7 @@ msgstr ""
 "països</guilabel> i trieu-hi el país o regió."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3598,21 +3673,20 @@ msgstr ""
 "cas, DrakX respectarà la tria."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Mètode d'entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 ""
 "A la pantalla d'<guilabel>Altres països</guilabel> també podeu seleccionar "
 "un mètode d'entrada (al final de la llista). Els mètodes d'entrada permeten "
@@ -3625,10 +3699,11 @@ msgstr ""
 "instal·lar si heu afegit suports HTTP/FTP abans de la selecció de paquets."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Si durant la instal·lació us heu oblidat de configurar el mètode d'entrada, "
@@ -3949,319 +4024,357 @@ msgstr ""
 "botons o més."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Opcions principals del menú d'arrencada"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Opcions principals del menú d'arrencada"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Podeu afegir una entrada o modificar la que heu triat, prement el botó "
-"adequat a la pantalla de <emphasis>Configuració de l'arrencada</emphasis> i "
-"editant la pantalla que hi apareix."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
-msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
-"Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una "
-"entrada i marcar la casella per a fer-la predeterminada."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
-msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
-"Podeu afegir el número de versió d'una entrada, o bé reanomenar-la "
-"completament."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"L'entrada predeterminada és aquella que es farà servir si no es fa cap "
-"selecció mentre el sistema està arrencant."
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+msgid ""
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr ""
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Ús del gestor d'arrencada de Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Opcions principals del menú d'arrencada"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Ús d'un gestor d'arrencada existent"
+
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+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 "
+"implicarà executar el programa d'instal·lació del gestor d'arrencada en "
+"qüestió, que el detectarà i afegirà automàticament. Vegeu la documentació "
+"del sistema operatiu corresponent."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Si preferiu una configuració del gestor d'arrencada diferent de la que ha "
-"estat triada automàticament, la podeu canviar aquí."
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Potser ja teniu un altre sistema operatiu a l'ordinador. En aquest cas, heu "
-"de decidir si voleu afegir Mageia al gestor d'arrencada existent, o bé "
-"permetre a Mageia que en creï un de nou."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Ús del gestor d'arrencada de Mageia"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia també ofereix GRUB2 com a gestor d'arrencada opcional, a més de "
-"l'antic GRUB i Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Aquí la millor solució és fer servir el gestor d'arrencada GRUB2, que està "
-"disponible a la pàgina de resum durant la instal·lació."
+"<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><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Ús d'un gestor d'arrencada existent"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Serveis</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de "
-"pensar a fer ATURA a la pàgina del resum durant la instal·lació, i fer clic "
-"el botó de <guibutton>Configuració</guibutton> del gestor d'arrencada, que "
-"us permetrà canviar-ne la localització."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr ""
-"Perquè quedi clar, sda és un dispositiu, mentre que sda7 n'és una partició."
-
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Aneu a tty2 amb Ctrl+Alt+F2 i escriviu <literal>df</literal> per a comprovar "
-"on és la partició <literal>/</literal> (root). Ctrl+Alt+F7 us torna a la "
-"pantalla d'instal·lació."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"implicarà executar el programa d'instal·lació del gestor d'arrencada en "
-"qüestió, que el detectarà i afegirà automàticament. Vegeu la documentació "
-"del sistema operatiu corresponent."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Opció avançada del gestor d'arrencada"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Si l'espai de disc per a la partició <literal>/</literal> que conté "
-"<literal>/tmp</literal> és molt limitat, cliqueu a <guibutton>Avançat</"
-"guibutton> i marqueu la casella <guilabel>Neteja /tmp en cada arrencada</"
-"guilabel>. Això ajudarà a mantenir espai lliure."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -4312,22 +4425,23 @@ msgstr ""
 "Llavors DrakX hauria de ser capaç de configurar els discs correctament."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Configuració del so"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4337,7 +4451,7 @@ msgstr ""
 "triat per a la targeta de so, que serà el predeterminat si n'hi ha un."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4353,7 +4467,7 @@ msgstr ""
 "de la pantalla."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4365,12 +4479,12 @@ msgstr ""
 "problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avançat"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4382,7 +4496,7 @@ msgstr ""
 "d'equivocat."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4532,12 +4646,12 @@ msgid "Uninstalling Mageia"
 msgstr "Desinstal·lació de Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4545,7 +4659,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4553,7 +4667,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4565,14 +4679,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4617,3 +4731,187 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "No obstant això, quan feu servir la nova instal·lació, tots els usuaris "
+#~ "afegits a <emphasis>MCC- Sistema - Gestiona els usuaris del sistema</"
+#~ "emphasis> tindran el directori d'usuari protegit contra lectura i "
+#~ "escriptura."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD doble arquitectura"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Les dues arquitectures estan presents en el mateix suport, la tria es fa "
+#~ "automàticament en funció de la CPU detectada."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Utilitza només l'escriptori Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "No tots els idiomes estan disponibles. (be, bg, ca, de, en, es, fr, it, "
+#~ "mk, pl, pt, ru, sv, uk) CAL VERIFICAR-HO!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Conté programari de propietat."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "CD autònom de KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Només 32 bits."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "CD autònom de GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ 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."
+#~ msgstr ""
+#~ "Podeu afegir una entrada o modificar la que heu triat, prement el botó "
+#~ "adequat a la pantalla de <emphasis>Configuració de l'arrencada</emphasis> "
+#~ "i editant la pantalla que hi apareix."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una "
+#~ "entrada i marcar la casella per a fer-la predeterminada."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Podeu afegir el número de versió d'una entrada, o bé reanomenar-la "
+#~ "completament."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "L'entrada predeterminada és aquella que es farà servir si no es fa cap "
+#~ "selecció mentre el sistema està arrencant."
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Si preferiu una configuració del gestor d'arrencada diferent de la que ha "
+#~ "estat triada automàticament, la podeu canviar aquí."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Potser ja teniu un altre sistema operatiu a l'ordinador. En aquest cas, "
+#~ "heu de decidir si voleu afegir Mageia al gestor d'arrencada existent, o "
+#~ "bé permetre a Mageia que en creï un de nou."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia també ofereix GRUB2 com a gestor d'arrencada opcional, a més de "
+#~ "l'antic GRUB i Lilo."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Aquí la millor solució és fer servir el gestor d'arrencada GRUB2, que "
+#~ "està disponible a la pàgina de resum durant la instal·lació."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de "
+#~ "pensar a fer ATURA a la pàgina del resum durant la instal·lació, i fer "
+#~ "clic el botó de <guibutton>Configuració</guibutton> del gestor "
+#~ "d'arrencada, que us permetrà canviar-ne la localització."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Perquè quedi clar, sda és un dispositiu, mentre que sda7 n'és una "
+#~ "partició."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Aneu a tty2 amb Ctrl+Alt+F2 i escriviu <literal>df</literal> per a "
+#~ "comprovar on és la partició <literal>/</literal> (root). Ctrl+Alt+F7 us "
+#~ "torna a la pantalla d'instal·lació."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Opció avançada del gestor d'arrencada"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Si l'espai de disc per a la partició <literal>/</literal> que conté "
+#~ "<literal>/tmp</literal> és molt limitat, cliqueu a <guibutton>Avançat</"
+#~ "guibutton> i marqueu la casella <guilabel>Neteja /tmp en cada arrencada</"
+#~ "guilabel>. Això ajudarà a mantenir espai lliure."
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 20417f37..cc0d9673 100644
--- a/docs/installer/cs.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-12-11 06:26+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -191,26 +191,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Správa uživatele  a superuživatele"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -218,12 +207,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -244,7 +233,7 @@ msgstr ""
 "neudělali překlep."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -253,12 +242,12 @@ msgstr ""
 "písmen (velkých a malých), čísel a ostatních znaků."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Zadejte uživatele"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -269,7 +258,7 @@ msgstr ""
 "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:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -278,7 +267,7 @@ msgstr ""
 "ikona uživatele."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -287,7 +276,7 @@ msgstr ""
 "pole skutečné jméno."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -299,7 +288,7 @@ msgstr ""
 "velikost písmen.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -310,7 +299,7 @@ msgstr ""
 "(Podívejte se i na <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -321,41 +310,22 @@ msgstr ""
 "textových polí pro uživatelské heslo."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Každý uživatel, kterého přidáte během instalace Mageia bude mít pro svět "
 "čitelný (ale chráněný proti zápisu) domovský adresář."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Každopádně, během používání vaší nové instalace, každý uživatel kterého "
-"přidáte v <emphasis>MCC - Systém - Spravovat uživatele v systému</emphasis> "
-"bude mít domácí adresář, který je chráněný stejně při čtení a zápisu."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Pokud nechcete mít světem čitelný domovský adresář pro každého, doporučuje "
-"se nyní přidat jen dočasného uživatele a skutečného uživatele (anebo více "
-"uživatelů) přidat až po restartu."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Pokud upřednostňujete světem čitelné domovské adresáře, možná budete chtít "
 "přidat všechny další potřebné uživatele v kroku <emphasis>Nastavení - "
@@ -363,17 +333,17 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Rozšířená správa uživatelů"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -383,12 +353,12 @@ msgstr ""
 "kterého přidáváte."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -399,7 +369,7 @@ msgstr ""
 "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:140
+#: en/addUser.xml:112
 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, "
@@ -410,7 +380,7 @@ msgstr ""
 "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:147
+#: en/addUser.xml:119
 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 "
@@ -421,7 +391,7 @@ msgstr ""
 "předchozí obrazovce, možnostmi jsou Bash, Dash a Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -432,7 +402,7 @@ msgstr ""
 "je prázdné, pokud nevíte, co děláte."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -809,12 +779,12 @@ msgstr ""
 "\">dodatečných krocích v Živém režimu</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Výběr pracovního prostředí"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -823,7 +793,7 @@ msgstr ""
 "pro jemné doladění vaší volby."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -834,16 +804,17 @@ msgstr ""
 "<guilabel>Podrobnosti</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -862,22 +833,23 @@ msgstr ""
 "předinstalovaného softwaru."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Výběr skupiny balíčků"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -890,22 +862,22 @@ msgstr ""
 "myší na název skupiny."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Pracovní stanice."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafické prostředí."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -914,10 +886,11 @@ msgstr ""
 "nebo odebrání balíčků."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref> pro instrukce, jak "
 "provést minimální instalaci (bez nebo s X &amp; IceWM)."
@@ -1399,23 +1372,24 @@ msgstr ""
 "výběru konzervativní."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1428,7 +1402,7 @@ msgstr ""
 "literal>, jinak váš systém nebude možné zavést."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1439,7 +1413,7 @@ msgstr ""
 "se podívat, co je na něm, předtím než začnete."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1448,7 +1422,7 @@ msgstr ""
 "je zařízení USB. Například sda, sdb a sdc, pokud jsou připojena tři."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1457,7 +1431,7 @@ msgstr ""
 "vybraném úložném zařízení."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1467,44 +1441,78 @@ msgstr ""
 "jeho velikost nebo jej vymažte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Pokračujte dokud jste nenastavil vše podle vašeho přání."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Pokud instalujete Mageiu na systém UEFI, zkontrolujte, zda je přítomen ESP "
 "(systémový oddíl EFI) a správně připojen na /boot/EFI (viz výše)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Pokud instalujete Mageiu na systém UEFI, zkontrolujte, zda je přítomen ESP "
+"(systémový oddíl EFI) a správně připojen na /boot/EFI (viz výše)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1515,7 +1523,7 @@ msgstr ""
 "nainstalovat <application>Mageiu</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1524,21 +1532,32 @@ msgstr ""
 "rozložení a obsahu vašeho konkrétního pevného disku."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Použít existující oddíly"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1547,12 +1566,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Použít volné místo"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1561,12 +1580,12 @@ msgstr ""
 "využije pro novou instalaci Mageii."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1575,7 +1594,7 @@ msgstr ""
 "může nabídnout jeho použití."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1586,7 +1605,7 @@ msgstr ""
 "zazálohovány všechny důležité soubory!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1602,7 +1621,7 @@ 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:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1615,7 +1634,7 @@ 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:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1623,23 +1642,33 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Smazat a použít celý disk"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1649,12 +1678,12 @@ msgstr ""
 "disku, která nejste připraveni ztratit, potom tuto volbu nepoužívejte."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Vlastní"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1663,19 +1692,19 @@ msgstr ""
 "(resp. discích)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Měnění velikostí oddílů:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 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:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1684,30 +1713,30 @@ msgstr ""
 "oddíl pro /, nebude tu žádný samostatný oddíl pro /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 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:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "zbytek (přinejmenším 12/19) je přiděleno pro /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1716,7 +1745,7 @@ msgstr ""
 "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:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1728,8 +1757,48 @@ msgstr ""
 "Volba \"Vlastní\" je jediná, která vám dovoluje zkontrolovat, že toto bylo "
 "provedeno správně."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1748,17 +1817,17 @@ msgstr ""
 "gparted, pokud vlastníte takové zařízení, a použít následující nastavení:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Zarovnat na\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Předcházející volné místo (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1870,27 +1939,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1900,7 +1966,7 @@ msgstr ""
 "je bezpečné vyjmout instalační médium a restartovat počítač."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1909,7 +1975,7 @@ msgstr ""
 "ve vašem počítači (pokud jich máte víc než jeden)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1918,12 +1984,12 @@ msgstr ""
 "vybrána a spuštěna vaše nainstalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Bavte se!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2058,6 +2124,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2719,30 +2790,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Souhrn různých parametrů"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2754,18 +2811,40 @@ msgstr ""
 "můžete zhodnotit zde a změnit je, jak chcete, po stisknutí "
 "<guibutton>Nastavit</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Systémové parametry"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Časové pásmo</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2776,12 +2855,12 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Země/Oblast</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2790,33 +2869,33 @@ msgstr ""
 "nastavení. Podívejte se na <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Zavaděč</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr "Nic na tom neměňte, pokud nevíte, jak nastavit Grub a/nebo Lilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Správa uživatelů</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2825,12 +2904,12 @@ msgstr ""
 "<literal>/home</literal> t. j. domácí adresáře."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Služby</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2840,7 +2919,7 @@ msgstr ""
 "umožňuje povolit nebo zakázat určité úlohy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2849,23 +2928,23 @@ 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:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Hardwarové parametry"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klávesnice</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2873,13 +2952,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Myš</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2888,12 +2974,12 @@ msgstr ""
 "kulové ovladače atd."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Zvuková karta</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2904,44 +2990,46 @@ msgstr ""
 "pro vaši kartu, ale žádný z nich není výchozí."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafické rozhraní</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Parametry sítě a internetu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Síť</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2954,7 +3042,7 @@ msgstr ""
 "(Nonfree)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2963,12 +3051,12 @@ msgstr ""
 "sledování onoho rozhraní."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2979,7 +3067,7 @@ msgstr ""
 "některé proxy služby."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2988,17 +3076,17 @@ msgstr ""
 "parametrů, které sem potřebujete zadat"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Bezpečnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3007,17 +3095,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:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3027,10 +3115,12 @@ msgstr ""
 "nebo ukradnout."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Vyberte si služby, které si přejete, aby měly přístup k vašemu systému. Vaše "
 "výběry budou záležet na tom, k čemu používáte váš počítač."
@@ -3042,32 +3132,54 @@ msgstr ""
 "Mějte na paměti, že dovolení všeho (žádný firewall) může být velmi riskantní."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Restartovat"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Když byl zavaděč nainstalován, budete vyzváni k pozastavení vašeho počítače, "
+"odstranění živého CD a restartování počítače. Když restartujete, uvidíte "
+"následnost ukazovatelů postupu stahování. Tyto naznačují, že softwarová "
+"média jsou stahována (viz Správa software)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Když byl zavaděč nainstalován, budete vyzváni k pozastavení vašeho počítače, "
 "odstranění živého CD a restartování počítače. Když restartujete, uvidíte "
 "následnost ukazovatelů postupu stahování. Tyto naznačují, že softwarová "
 "média jsou stahována (viz Správa software)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3128,17 +3240,17 @@ msgstr ""
 "<guilabel>Bezpečnost</guilabel> Ovládacího centra Mageii."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Vyberte a používejte ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Úvod"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3147,12 +3259,12 @@ msgstr ""
 "obraz vyhovuje vašim potřebám."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Jsou tu dvě rodiny nosičů:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3166,7 +3278,7 @@ msgstr ""
 "nainstalujete."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3177,22 +3289,22 @@ msgstr ""
 "jednodušší, ale dostanete méně možností výběru."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definice"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3203,7 +3315,7 @@ msgstr ""
 "kterou je soubor ISO zkopírován."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3212,39 +3324,39 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klasické instalační nosiče"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Běžné vlastnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr "Dokáží udělat čistou instalaci nebo aktualizovat z předchozích vydání."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Rozličné nosiče pro 32 nebo 64 bitovou architekturu."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3253,56 +3365,23 @@ msgstr ""
 "paměťový test, nástroj na zjištění hardware."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 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><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Obě architektury jsou přítomny na tomtéž nosiči, volba je učiněna "
-"automaticky vzhledem k nalezenému procesoru."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Používá jen pracovní plochu Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Ne všechny jazyky jsou dostupné. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TŘEBA ZKONTROLOVAT!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Obsahuje nesvobodný software."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Živé nosiče"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3311,19 +3390,21 @@ msgstr ""
 "disk i na volitelné nainstalování Mageii na váš pevný disk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 "Každé ISO obsahuje jen jedno prostředí pracovní plochy (KDE nebo GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3334,63 +3415,57 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Obsahují nesvobodný software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Jen prostředí pracovní plochy KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Jen anglický jazyk."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Pouze 32 bitové."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Všechny jazyky jsou přítomny."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Jen prostředí pracovní plochy GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Všechny jazyky jsou přítomny."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Jen prostředí pracovní plochy KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Jen zaváděcí nosiče CD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3404,7 +3479,7 @@ msgstr ""
 "anebo na internetu."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3414,13 +3489,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Jen anglický jazyk."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Spustit instalaci"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3429,12 +3510,13 @@ msgstr ""
 "nesvobodný software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3443,17 +3525,17 @@ msgstr ""
 "jej potřebují."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Stahování a zkontrolování nosiče"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Stažení"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3466,12 +3548,12 @@ msgstr ""
 "nízká. Pokud je vybráno http, můžete uvidět i něco takového"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3482,22 +3564,22 @@ msgstr ""
 "link>. Potom se objeví toto okno:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Zaškrtněte přepínací tlačítko Uložit soubor."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Kontrolování neporušenosti stáhnutého nosiče"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3512,12 +3594,12 @@ msgstr ""
 "soubor. Poškození nabádá k tomu, že byste se měli pokusit stáhnout ISO znovu."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3526,7 +3608,7 @@ msgstr ""
 "obrazovému/souboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3535,7 +3617,7 @@ msgstr ""
 "obrazovému/souboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3544,17 +3626,17 @@ msgstr ""
 "chvilku počkat) s číslem daným Mageiou. Například:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Vypálení nebo vepsání souboru ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3564,12 +3646,12 @@ msgstr ""
 "k vytvoření zaveditelného nosiče."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3583,12 +3665,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "Zapsat ISO na USB flash"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3598,7 +3680,7 @@ msgstr ""
 "systému."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3609,7 +3691,7 @@ msgstr ""
 "oddílu bude zmenšena na velikost obrazu."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3618,12 +3700,12 @@ msgstr ""
 "naformátovat ho."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3632,17 +3714,17 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Můžete vyzkoušet:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3651,7 +3733,7 @@ msgstr ""
 "použitím volby \"obraz ISO\";"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3660,12 +3742,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3674,17 +3756,17 @@ msgstr ""
 "diskový oddíl, zadáte-li nesprávně ID zařízení."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Otevřete konzoli"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3693,12 +3775,12 @@ msgstr ""
 "userinput> (nezapomeňte na koncovou pomlčku '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3708,17 +3790,17 @@ msgstr ""
 "zpřístupnit nebo z něho číst)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3729,7 +3811,7 @@ msgstr ""
 "<emphasis>sdd</emphasis> v tomto případě:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3771,7 +3853,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3780,7 +3862,7 @@ msgstr ""
 "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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3789,12 +3871,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 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:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3803,37 +3885,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Odpojte vaše zařízení USB. Je hotovo."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Vyberte zemi"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3842,7 +3924,7 @@ msgstr ""
 "vést k neschopnosti používání bezdrátové sítě."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3851,7 +3933,7 @@ msgstr ""
 "guilabel> a tam si vyberte vaši zemi/oblast."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3864,21 +3946,20 @@ msgstr ""
 "volbu."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Vstupní metoda"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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í "
 "metodu (v seznamu dole). Vstupní metody uživatelům dovolují vkládat "
@@ -3891,10 +3972,11 @@ msgstr ""
 "balíčků."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Pokud jste během instalace vynechali nastavení vstupní metody, můžete ji "
@@ -4232,355 +4314,380 @@ msgstr ""
 "více tlačítek."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Pro více informací o volbách pro kernel na zastaralých systémech a systémech "
+"UEFI se podívejte na: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Základní nastavení zaváděcího programu"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Se systémem BIOS"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Základní nastavení zaváděcího programu"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Můžete přidat položku anebo upravit tu, kterou jste si nejprve vybrali, "
-"stisknutím příslušného tlačítka na obrazovce <emphasis>Nastavení zavaděče</"
-"emphasis> a upravováním obrazovky, která se objeví nad ní."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Pokud jste si vybrali <code>Grub 2</code> jako váš zavaděč, můžete v tomto "
-"kroku použít tento nástroj na úpravu položek, stiskněte 'Další'. Potřebujete "
-"ručně upravit soubor <code>/boot/grub2/custom.cfg</code>, anebo místo toho "
-"použít <code>grub-customizer</code>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Se systémem UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "Grafické nabídky Mageii jsou pěkné:"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+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:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Se systémem UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Některými věcmi, které mohou být vykonány bez jakéhokoli nebezpečí, jsou "
-"změna nadpisu položky a zaškrtnutí políčka, aby se položka stala výchozí."
+"Se systémem UEFI je uživatelské rozhraní trochu odlišné, protože si nemůžete "
+"zvolit zavaděč systému, jelikož je dostupný jen Grub2-efi."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
-msgstr "Můžete přidat správné číslo verze položky, nebo ji celou přejmenovat."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Výchozí položka je ta, kterou systém spustí, jestliže během spouštění "
-"systému neuděláte jinou volbu."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Úprava jiných věcí vás může ponechat s nespustitelným systémem. Nezkoušejte, "
-"prosím, nic bez znalosti toho, co děláte."
+"Pokud je Mageia prvním systémem nainstalovaným na váš počítač, instalátor "
+"vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud "
+"ve vašem počítači byly už předtím nainstalovány operační systémy UEFI "
+"(například Windows 8), instalátor Mageii zjistil stávající ESP vytvořený "
+"operačním systémem Windows a přidal grub2-efi. Ačkoli je možno mít více "
+"oddílů ESP, radí se mít a stačí jen jeden, bez ohledu na počet operačních "
+"systémů, které máte v počítači."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Se systémem UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Použití zavaděče Mageii"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"V tomto případě používáte Grub2-efi a nemůžete použít tento nástroj na "
-"úpravu položek v tomto kroku. Abyste to mohl vykonat, potřebujete ručně "
-"upravit <code>/boot/grub2/custom.cfg</code> nebo namísto toho použít "
-"<code>grub-customizer</code>. Jediné co tu můžete udělat, je zvolit výchozí "
-"položku ve vysouvacím seznamu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Po klepnutí na tlačítko <guibutton>Další</guibutton> vám další vysouvací "
-"seznam dovolí vybrat si rozlišení obrazovky pro Grub2, který je grafickým "
-"zavaděčem systémů."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Základní nastavení zaváděcího programu"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Použití už existujícího zavaděče"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+msgstr ""
+"Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči "
+"přesahuje oblast této nápovědy, avšak ve většině případů bude zahrnovat "
+"spuštění příslušného programu na instalaci zavaděče, který by ho měl "
+"rozpoznat a přidat automaticky. Podívejte se na dokumentaci k operačnímu "
+"systému, o nějž jde."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
+msgid ""
+"If you don't want a bootable Mageia, but 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>."
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Pokud upřednostňujete odlišné nastavení zavaděče namísto těch automaticky "
-"vybraných instalátorem, můžete je zde změnit."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Pokud již ve vašem počítači máte jiný operační systém, v tom případě se "
-"potřebujete rozhodnout, zda přidáte Mageiu k vašemu už existujícímu "
-"zavaděči, nebo Mageie dovolíte vytvořit nový zavaděč."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Grafické nabídky Mageii jsou pěkné:"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Použití zavaděče Mageii"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
-"Ve výchozím nastavení Mageia zapisuje nový zavaděč (zastaralého) GRUBa do "
-"MBR (Hlavního spouštěcího záznamu) vašeho prvního pevného disku. Pokud už "
-"máte nainstalovány jiné operační systémy, Mageia se pokusí o jejich přidání "
-"do vaší nové spouštěcí nabídky Mageii."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia teď také nabízí GRUB2 jako volitelný zavaděč navíc k zastaralému "
-"GRUBu a Lilu."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Linuxové systémy, které používají zavaděč GRUB2, nejsou v současnosti "
-"podporovány (zastaralým) GRUBem a nebudou rozpoznány, pokud je použit "
-"výchozí zavaděč GRUB."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Tady je nejlepším řešením používat zavaděč GRUB2, který je dostupný na "
-"souhrnné stránce během instalace."
+"<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."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Použití už existujícího zavaděče"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Služby</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Pokud se rozhodnete použít už existující zavaděč, potom se potřebujete během "
-"instalace ZASTAVIT na souhrnné stránce a klepnout na tlačítko zavaděče "
-"<guibutton>Nastavit</guibutton>, které vám dovolí změnit instalační umístění "
-"zavaděče."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Nevybírejte si zařízení jako je např. \"sda\", nebo přepíšete váš existující "
-"MBR. Musíte si vybrat kořenový oddíl, který jste si vybrali dříve během fáze "
-"dělení disku, jako je např. sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
 msgstr ""
-"Pro ujasnění, sda je zařízení, sda7 je oddíl nebo jinak řečeno oddíl na onom "
-"zařízení."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Jděte do tty2 stisknutím Ctrl+Alt+F2 a napište <literal>df</literal> pro "
-"zkontrolování, kde je umístěn váš <literal>/</literal> (kořenový) oddíl. Ctrl"
-"+Alt+F7 vás dostane nazpět na obrazovku instalátoru."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
-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."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
 msgstr ""
-"Přesný postup pro přidání vašeho systému Mageia k existujícímu zavaděči "
-"přesahuje oblast této nápovědy, avšak ve většině případů bude zahrnovat "
-"spuštění příslušného programu na instalaci zavaděče, který by ho měl "
-"rozpoznat a přidat automaticky. Podívejte se na dokumentaci k operačnímu "
-"systému, o nějž jde."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Pokročilé parametry zavaděče"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"pokud máte velmi omezený diskový prostor pro <literal>/</literal> oddíl, "
-"který obsahuje adresář <literal>/tmp</literal>, klepněte na tlačítko "
-"<guibutton>Pokročilé</guibutton> a zkontrolujte políčko <guilabel>Vyčistit /"
-"tmp před každým zavedením systému</guilabel>. Toto pomůže udržet trochu "
-"volného místa."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"Se systémem UEFI je uživatelské rozhraní trochu odlišné, protože si nemůžete "
-"zvolit zavaděč systému, jelikož je dostupný jen Grub2-efi."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<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."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Pokud je Mageia prvním systémem nainstalovaným na váš počítač, instalátor "
-"vytvořil ESP (systémový oddíl EFI) pro zapsání zavaděče (Grub2-efi). Pokud "
-"ve vašem počítači byly už předtím nainstalovány operační systémy UEFI "
-"(například Windows 8), instalátor Mageii zjistil stávající ESP vytvořený "
-"operačním systémem Windows a přidal grub2-efi. Ačkoli je možno mít více "
-"oddílů ESP, radí se mít a stačí jen jeden, bez ohledu na počet operačních "
-"systémů, které máte v počítači."
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "Neupravujte \"Zaváděcí zařízení\", pokud s jistotou nevíte, co děláte."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4629,22 +4736,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX by pak měl být schopen správně nastavit disk(y)."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Nastavení zvuku"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4655,7 +4763,7 @@ msgstr ""
 "výchozí."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4670,7 +4778,7 @@ msgstr ""
 "<guilabel>Nastavení zvuku</guilabel> v horní pravé části obrazovky."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4681,12 +4789,12 @@ msgstr ""
 "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:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Rozšíření"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4698,7 +4806,7 @@ msgstr ""
 "ovladač."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4873,12 +4981,12 @@ msgid "Uninstalling Mageia"
 msgstr "Odinstalování Mageii"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Jak na to"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4889,7 +4997,7 @@ msgstr ""
 "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:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4901,7 +5009,7 @@ msgstr ""
 "systému."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4920,7 +5028,7 @@ msgstr ""
 "guibutton>. Prostor bude uvolněn."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4929,7 +5037,7 @@ msgstr ""
 "(FAT32 nebo NTFS). Bude mu přiřazeno písmeno oddílu."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4987,3 +5095,308 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Každopádně, během používání vaší nové instalace, každý uživatel kterého "
+#~ "přidáte v <emphasis>MCC - Systém - Spravovat uživatele v systému</"
+#~ "emphasis> bude mít domácí adresář, který je chráněný stejně při čtení a "
+#~ "zápisu."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Pokud nechcete mít světem čitelný domovský adresář pro každého, "
+#~ "doporučuje se nyní přidat jen dočasného uživatele a skutečného uživatele "
+#~ "(anebo více uživatelů) přidat až po restartu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Obě architektury jsou přítomny na tomtéž nosiči, volba je učiněna "
+#~ "automaticky vzhledem k nalezenému procesoru."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Používá jen pracovní plochu Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Ne všechny jazyky jsou dostupné. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TŘEBA ZKONTROLOVAT!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Obsahuje nesvobodný software."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Pouze 32 bitové."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Se systémem BIOS"
+
+#~ 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."
+#~ msgstr ""
+#~ "Můžete přidat položku anebo upravit tu, kterou jste si nejprve vybrali, "
+#~ "stisknutím příslušného tlačítka na obrazovce <emphasis>Nastavení "
+#~ "zavaděče</emphasis> a upravováním obrazovky, která se objeví nad ní."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Pokud jste si vybrali <code>Grub 2</code> jako váš zavaděč, můžete v "
+#~ "tomto kroku použít tento nástroj na úpravu položek, stiskněte 'Další'. "
+#~ "Potřebujete ručně upravit soubor <code>/boot/grub2/custom.cfg</code>, "
+#~ "anebo místo toho použít <code>grub-customizer</code>."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Některými věcmi, které mohou být vykonány bez jakéhokoli nebezpečí, jsou "
+#~ "změna nadpisu položky a zaškrtnutí políčka, aby se položka stala výchozí."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Můžete přidat správné číslo verze položky, nebo ji celou přejmenovat."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Výchozí položka je ta, kterou systém spustí, jestliže během spouštění "
+#~ "systému neuděláte jinou volbu."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Úprava jiných věcí vás může ponechat s nespustitelným systémem. "
+#~ "Nezkoušejte, prosím, nic bez znalosti toho, co děláte."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "V tomto případě používáte Grub2-efi a nemůžete použít tento nástroj na "
+#~ "úpravu položek v tomto kroku. Abyste to mohl vykonat, potřebujete ručně "
+#~ "upravit <code>/boot/grub2/custom.cfg</code> nebo namísto toho použít "
+#~ "<code>grub-customizer</code>. Jediné co tu můžete udělat, je zvolit "
+#~ "výchozí položku ve vysouvacím seznamu."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Po klepnutí na tlačítko <guibutton>Další</guibutton> vám další vysouvací "
+#~ "seznam dovolí vybrat si rozlišení obrazovky pro Grub2, který je grafickým "
+#~ "zavaděčem systémů."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Pokud upřednostňujete odlišné nastavení zavaděče namísto těch automaticky "
+#~ "vybraných instalátorem, můžete je zde změnit."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Pokud již ve vašem počítači máte jiný operační systém, v tom případě se "
+#~ "potřebujete rozhodnout, zda přidáte Mageiu k vašemu už existujícímu "
+#~ "zavaděči, nebo Mageie dovolíte vytvořit nový zavaděč."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Ve výchozím nastavení Mageia zapisuje nový zavaděč (zastaralého) GRUBa do "
+#~ "MBR (Hlavního spouštěcího záznamu) vašeho prvního pevného disku. Pokud už "
+#~ "máte nainstalovány jiné operační systémy, Mageia se pokusí o jejich "
+#~ "přidání do vaší nové spouštěcí nabídky Mageii."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia teď také nabízí GRUB2 jako volitelný zavaděč navíc k zastaralému "
+#~ "GRUBu a Lilu."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linuxové systémy, které používají zavaděč GRUB2, nejsou v současnosti "
+#~ "podporovány (zastaralým) GRUBem a nebudou rozpoznány, pokud je použit "
+#~ "výchozí zavaděč GRUB."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Tady je nejlepším řešením používat zavaděč GRUB2, který je dostupný na "
+#~ "souhrnné stránce během instalace."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Pokud se rozhodnete použít už existující zavaděč, potom se potřebujete "
+#~ "během instalace ZASTAVIT na souhrnné stránce a klepnout na tlačítko "
+#~ "zavaděče <guibutton>Nastavit</guibutton>, které vám dovolí změnit "
+#~ "instalační umístění zavaděče."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Nevybírejte si zařízení jako je např. \"sda\", nebo přepíšete váš "
+#~ "existující MBR. Musíte si vybrat kořenový oddíl, který jste si vybrali "
+#~ "dříve během fáze dělení disku, jako je např. sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Pro ujasnění, sda je zařízení, sda7 je oddíl nebo jinak řečeno oddíl na "
+#~ "onom zařízení."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Jděte do tty2 stisknutím Ctrl+Alt+F2 a napište <literal>df</literal> pro "
+#~ "zkontrolování, kde je umístěn váš <literal>/</literal> (kořenový) oddíl. "
+#~ "Ctrl+Alt+F7 vás dostane nazpět na obrazovku instalátoru."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Pokročilé parametry zavaděče"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "pokud máte velmi omezený diskový prostor pro <literal>/</literal> oddíl, "
+#~ "který obsahuje adresář <literal>/tmp</literal>, klepněte na tlačítko "
+#~ "<guibutton>Pokročilé</guibutton> a zkontrolujte políčko "
+#~ "<guilabel>Vyčistit /tmp před každým zavedením systému</guilabel>. Toto "
+#~ "pomůže udržet trochu volného místa."
diff --git a/docs/installer/de.po b/docs/installer/de.po
index e102d83d..5a426dea 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 09:03+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -198,26 +198,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Verwaltung des Benutzers und des Superusers"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -225,12 +214,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Setzen des Administrator (root)  Passworts:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -253,7 +242,7 @@ msgstr ""
 "vertippt haben."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -263,12 +252,12 @@ msgstr ""
 "Sonderzeichen in einem Passwort verwenden."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Einen Benutzer eingeben"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -280,7 +269,7 @@ msgstr ""
 "einem Computer macht."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -289,7 +278,7 @@ msgstr ""
 "sich das Symbol für den Benutzer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -298,7 +287,7 @@ msgstr ""
 "wirklichen Namen des Benutzers ein."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -310,7 +299,7 @@ msgstr ""
 "Anmeldename beachtet die Groß-/Kleinschreibung</emphasis>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -321,7 +310,7 @@ msgstr ""
 "Passwort ist. (Siehe auch <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -333,42 +322,23 @@ msgstr ""
 "Benutzer in den beiden Textboxen."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Jeder Nutzer, der bei der Installation von Mageia hinzugefügt wird, besitzt "
 "ein home Verzeichnis, welches systemweit gelesen werden kann, aber "
 "schreibgeschützt ist."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Allerdings wird jeder Nutzer, der in <emphasis>MCC - System - Verwalte "
-"Nutzer im System </emphasis>hinzugefügt wird, ein sowohl lese- als auch "
-"schreibgeschütztes home Verzeichnis besitzen."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Wenn Sie kein öffentlich zugängliches Home-Verzeichnis für alle haben "
-"möchten, wird empfohlen, einen temporären Benutzer anzulegen und die "
-"tatsächlichen Benutzer nach einem Neustart hinzuzufügen."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Wenn Sie systemweit lesbare home Verzeichnisse bevorzugen, sollten Sie alle "
 "zusätzlichen Nutzer in dem Schritt <emphasis>Konfiguration - "
@@ -376,18 +346,18 @@ msgstr ""
 "<emphasis>Benutzerverwaltung</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Fortgeschrittene Benutzerverwaltung"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -397,12 +367,12 @@ msgstr ""
 "Benutzer editiert werden können."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -414,7 +384,7 @@ msgstr ""
 "wichtigen Daten auf einen USB-Stick sichern."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -426,7 +396,7 @@ msgstr ""
 "Gast hat aber eingeschränktere Rechte als ein normaler Benutzer."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -437,7 +407,7 @@ msgstr ""
 "hinzugefügt haben. Zur Auswahl stehen Bash, Dash und Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -449,7 +419,7 @@ msgstr ""
 "solange leer, bis Sie wissen, was Sie tun."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -840,12 +810,12 @@ msgstr ""
 "<link linkend=\"testing\">zusätzliche Schritte im Live Modus</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Desktopauswahl"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -854,7 +824,7 @@ msgstr ""
 "angezeigt, um Ihre Installation individuell zu gestalten."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -865,16 +835,17 @@ msgstr ""
 "<guilabel>Details</guilabel>-Knopfes beendet werden."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -894,22 +865,23 @@ msgstr ""
 "Candy\" und es werden standardmäßig weniger Pakete installiert."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Paketgruppenauswahl"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "  <imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -923,22 +895,22 @@ msgstr ""
 "Gruppen fahren."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Workstation"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafische Umgebung."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -947,10 +919,11 @@ msgstr ""
 "können, wählen Sie bitte diese Option.)"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref> für eine Anleitung, wie man "
 "eine minimale Installation durchführt (ohne oder mit X &amp; IceWM)."
@@ -1448,23 +1421,24 @@ msgstr ""
 "Nochmal: es ist besser eher zu niedrige Einstellungen zu wählen."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Benutzerdefinierte Laufwerkspartitionierung mit DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1478,7 +1452,7 @@ msgstr ""
 "emphasis> gesetzt werden, da sonst das System nicht gebootet werden kann."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1490,7 +1464,7 @@ msgstr ""
 "anfangen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1500,7 +1474,7 @@ msgstr ""
 "und <emphasis>sdc</emphasis>, wenn drei Laufwerke gefunden wurden."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1509,7 +1483,7 @@ msgstr ""
 "gewählten Laufwerks zu löschen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1520,46 +1494,81 @@ msgstr ""
 "ändern Sie die Größe oder löschen Sie die Partition."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Wiederholen Sie diesen Vorgang für alle Laufwerke, bis alle Einstellungen "
 "Ihren Wünschen entsprechen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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 oben)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+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 oben)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1570,7 +1579,7 @@ msgstr ""
 "<application>Mageia</application> vorschlägt."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1579,21 +1588,32 @@ msgstr ""
 "Festplatte(n)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Verwende vorhandene Partitionen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1602,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Nutze freien Speicherplatz"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1616,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:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1630,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:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1642,7 +1662,7 @@ msgstr ""
 "Datenträger gesichert sind."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1660,7 +1680,7 @@ msgstr ""
 "die persönlichen Daten vor dem Vorgang zu sichern."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1675,7 +1695,7 @@ msgstr ""
 "dazu den Screenshot unten."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1683,25 +1703,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 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:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 +1742,12 @@ msgstr ""
 "dürfen, dann nutzen Sie bitte nicht diese Option."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1726,12 +1756,12 @@ msgstr ""
 "Installation auf den Festplatten."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1740,7 +1770,7 @@ msgstr ""
 "aufteilen:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1749,7 +1779,7 @@ msgstr ""
 "eine Partition für / erstellt und keine seperate Partition für /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1757,7 +1787,7 @@ msgstr ""
 "Partitionen erstellt"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1765,17 +1795,17 @@ msgstr ""
 "maximalen Größe von 50 GB "
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "der Rest (die übrigen 12/19) wird /home zugewiesen."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1785,7 +1815,7 @@ msgstr ""
 "der Rest für /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1797,8 +1827,48 @@ msgstr ""
 "als /boot/EFI eingebunden. Die \"Benutzerdefiniert\" Option ist die einzige "
 "Möglichkeit um nachzuprüfen, ob dies erfolgreich durchgeführt wurde."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1817,17 +1887,17 @@ msgstr ""
 "folgende Einstellungen zu partitionieren:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Ausrichten an:\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Vorhergehender freier Speicherplatz (MiB):\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1942,26 +2012,23 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch!"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1972,7 +2039,7 @@ msgstr ""
 "Computer neu starten können."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1982,7 +2049,7 @@ msgstr ""
 "ist)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1991,12 +2058,12 @@ msgstr ""
 "von Ihnen installierte Mageia automatisch gewählt und gestartet."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Viel Vergnügen!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2137,6 +2204,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2824,30 +2896,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Zusammenfassung von verschiedenen Parameter"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summary.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2860,18 +2918,40 @@ msgstr ""
 "und diese gegebenenfalls ändern, indem Sie auf <guibutton>Konfiguration</"
 "guibutton> klicken."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Systemparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zeitzone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2882,12 +2962,12 @@ msgstr ""
 "unter <xref linkend=\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land / Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2896,39 +2976,39 @@ msgstr ""
 "diese Einstellung korrigieren. Siehe <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Bootloader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, 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 "
 "Grub und/oder Lilo zu konfigurieren sind."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Benutzerverwaltung</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2937,12 +3017,12 @@ msgstr ""
 "benutzereigenen Ordnern unter <literal>/home</literal> angelegt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Dienste</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2952,7 +3032,7 @@ msgstr ""
 "(Anwendungen/Aufgaben) zu aktivieren oder zu deaktivieren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2961,23 +3041,23 @@ msgstr ""
 "- ein Fehler kann Ihren Computer davon abhalten, korrekt zu funktionieren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Hardwareparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastatur</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2985,13 +3065,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Maus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -3000,12 +3087,12 @@ msgstr ""
 "oder einstellen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Soundkarte</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -3016,46 +3103,47 @@ msgstr ""
 "mehrere Treiber für ihre Karte gibt und keiner Standard ist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafikkarte</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Netzwerk- und Internetparameter"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Netzwerk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -3068,7 +3156,7 @@ msgstr ""
 "Repositorium noch nicht aktiviert haben."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -3077,12 +3165,12 @@ msgstr ""
 "zu setzen, dass auch diese Netzwerkkarte überwacht wird."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -3093,24 +3181,24 @@ msgstr ""
 "konfigurieren, dass ein Proxy-Dienst verwendet wird."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
 msgstr "Fragen Sie Ihren Systemadministrator nach Ihren Zugangsdaten."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Sicherheit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Sicherheitsstufe</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3120,19 +3208,19 @@ msgstr ""
 "Zwecke."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3142,10 +3230,12 @@ msgstr ""
 "wollen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Wählen Sie die Dienste, denen Sie Zugriff auf Ihr System gestatten wollen. "
 "Die von Ihnen getroffene Auswahl ist abhängig davon, wofür Sie Ihren "
@@ -3159,26 +3249,39 @@ msgstr ""
 "erlauben (keine Firewall)."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Neustart"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Ist der Bootloader installiert, werden Sie dazu aufgefordert, die Live-CD zu "
+"entfernen und Ihren Computer neuzustarten. Wenn Sie Ihren Computer "
+"neustarten, werden Sie eine Folge von Download-Ladebalken sehen. Diese "
+"weisen darauf hin, dass die Softwaremedien heruntergeladen werden (siehe "
+"Softwaremanagement)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Ist der Bootloader installiert, werden Sie dazu aufgefordert, die Live-CD zu "
 "entfernen und Ihren Computer neuzustarten. Wenn Sie Ihren Computer "
@@ -3186,6 +3289,16 @@ msgstr ""
 "weisen darauf hin, dass die Softwaremedien heruntergeladen werden (siehe "
 "Softwaremanagement)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3248,17 +3361,17 @@ msgstr ""
 "<guilabel>Sicherheit</guilabel> an der linken Seite des Fensters wählen."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Auswählen und verwenden der ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Einleitung"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3267,12 +3380,12 @@ msgstr ""
 "Wahl des zu Ihren bedürfnissen passenden Images helfen."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Es gibt zwei Arten von Medien:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3286,7 +3399,7 @@ msgstr ""
 "Desktop-Umgebung auswählen, die Sie nutzen möchten."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3298,22 +3411,22 @@ msgstr ""
 "Auswahlmöglichkeiten."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Medien"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definition"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3324,7 +3437,7 @@ msgstr ""
 "auf verschiedene physische Datenträger übertragen werden."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3333,24 +3446,24 @@ msgstr ""
 "\">hier</link> finden."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klassische Installationsmedien"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Grundsätzliche Eigenschaften"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3358,17 +3471,17 @@ msgstr ""
 "vorrigen Veröffentlichung zu machen."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Verschiedene Medien für die 32-Bit oder 64-Bit Architektur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3377,58 +3490,25 @@ msgstr ""
 "Speichertest, Hardware-Erkennungswerkzeug."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Jede DVD enthält viele verfügbare Arbeitsumgebungen und Sprachen."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Sie erhalten während der Installation die Möglichkeit non-free Software "
 "hinzuzufügen."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "Dual Arch DVD"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Beide Architekturen sind auf dem gleichen Medium vorhanden, die Auswahl wird "
-"automatisch anhand der erkannten CPU getroffen."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Verwendet nur den Xfce-Desktop."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Nicht alle Sprachen sind verfügbar. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) MUSS ÜBERPRÜFT WERDEN!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Es ist unfreie Software enthalten."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live Medien"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3438,18 +3518,20 @@ msgstr ""
 "installiert werden."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Jede ISO enthält nur eine Desktopumgebung (KDE oder GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3460,63 +3542,57 @@ msgstr ""
 "um vorrige Veröffentlichungen zu aktualisieren.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Sie enthält unfreie Software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live-CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live-DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Nur KDE Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Nur englische Sprache."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Nur 32-Bit."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Alle Sprachen sind vorhanden."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live-CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live-DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Nur GNOME Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live-DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Alle Sprachen sind vorhanden."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live-DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Nur KDE Desktop-Umgebung."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Boot-only CD Medien"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3530,7 +3606,7 @@ msgstr ""
 "Netzwerk oder im Internet befinden."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3540,13 +3616,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Nur englische Sprache."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Installation beginnen"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3555,12 +3637,13 @@ msgstr ""
 "ablehnen."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3569,17 +3652,17 @@ msgstr ""
 "diese benötigen."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Medien herunterladen und überprüfen"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Herunterladen"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3593,12 +3676,12 @@ msgstr ""
 "ausgewählt wurde sehen Sie womöglich etwas wie"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3610,22 +3693,22 @@ msgstr ""
 "Anschließend wird dieses Fenster erscheinen:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Wähle den Auswahlknopf \"Datei speichern\"."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Überprüfen der integrietät der heruntergeladenen Datei"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3642,12 +3725,12 @@ msgstr ""
 "Download erneut versuchen."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3656,7 +3739,7 @@ msgstr ""
 "Pfad/zu/der/Abbild/Datei.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3665,7 +3748,7 @@ msgstr ""
 "<userinput>sha1sum Pfad/zu/der/Abbild/Datei.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3675,17 +3758,17 @@ msgstr ""
 "erhalten. Beispiel:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Brennen oder übertragen der ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3695,12 +3778,12 @@ msgstr ""
 "zielt darauf ab ein bootbares Medium zu erstellen."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3714,12 +3797,12 @@ msgstr ""
 "Images_auf_CD_und_DVD_brennen\">Mageia Wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3728,7 +3811,7 @@ msgstr ""
 "'dumpen' können um davon zu booten und das System zu installieren."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3739,7 +3822,7 @@ msgstr ""
 "auf die Imagegröße reduziert."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3748,12 +3831,12 @@ msgstr ""
 "neu partitionieren und formatieren."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3763,17 +3846,17 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Sie können versuchen:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3782,7 +3865,7 @@ msgstr ""
 "Verwendung der Auswahl \"ISO-Abbild\";"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3791,12 +3874,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Verwenden der Befehlzeile in einem GNU/Linux System"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3806,17 +3889,17 @@ msgstr ""
 "Versehen die falsche Geräte-ID verwenden."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Öffnen Sie eine Konsole"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3825,12 +3908,12 @@ msgstr ""
 "nicht das '-' am Ende)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3840,17 +3923,17 @@ msgstr ""
 "auf diesen zugreift oder liest)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3862,7 +3945,7 @@ msgstr ""
 "emphasis> ist:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3904,7 +3987,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3913,7 +3996,7 @@ msgstr ""
 "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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3922,12 +4005,12 @@ msgstr ""
 "bs=1M</userinput> ein"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 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:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3936,37 +4019,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Entferne den USB-Stick, es ist fertig"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Wählen des Landes / der Region"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3976,7 +4059,7 @@ msgstr ""
 "des WLANs führen."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3986,7 +4069,7 @@ msgstr ""
 "Region."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3999,21 +4082,20 @@ msgstr ""
 "ignorieren Sie dies, DrakX befolgt die von Ihnen getroffene Auswahl."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Eingabemethode"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 ""
 "Am Bildschirm <guilabel>Andere Länder</guilabel> können Sie auch eine "
 "Eingabemethode wählen (am Ende der Liste). Eingabemethoden erlauben es dem "
@@ -4027,10 +4109,11 @@ msgstr ""
 "hinzufügen."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Vermissen Sie während der Installation die Einstellungen der Eingabemethode, "
@@ -4379,366 +4462,384 @@ msgstr ""
 "Multifunktionsmaus zu konfigurieren."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Für mehr Informationen über Kernel-Optionen auf alten und UEFI-Systemen, "
+"siehe: <link ns2:href=\"https://wiki.mageia.org/de/"
+"Wie_man_Kerneloptionen_einstellt\">https://wiki.mageia.org/de/"
+"Wie_man_Kerneloptionen_einstellt</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Hauptoptionen des Bootloaders"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Mit einem BIOS System"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Hauptoptionen des Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Sie können einen Eintrag hinzufügen oder den vorher gewählten ändern, indem "
-"Sie den entprechenden Knopf im <emphasis>Bootloader "
-"Konfigurationsbildschirm</emphasis> drücken und die Einstellungen im "
-"Fenster, welches darüber erscheint, verändern."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Falls Sie <code>Grub 2</code> als Bootloader ausgewählt haben, können Sie "
-"dieses Werkzeug nicht verwenden um die Einträge zu bearbeiten. Drücke "
-"'Weiter'. Sie müssen stattdessen <code>/boot/grub2/custom.cfg</code> manuell "
-"editieren oder <code>grub-customizer</code> verwenden."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Mit einem UEFI System"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "Die grafischen Menüs von Mageia sind schön:"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+"Änderen Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Mit einem UEFI System"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Einige risikofreie Dinge ändern die Bezeichnung eines Eintrags und "
-"aktivieren das Kästchen, welches den Eintrag als Standard setzt."
+"Bei einem UEFI-System ist die Benutzungsoberfläche etwas anders, da Sie den "
+"Bootloader nicht auswählen können weil nur Grub2-efi verfügbar ist."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Sie können die korrekte Versionsnummer eines Eintrags hinzufügen, oder ihn "
-"vollständig umbenennen."
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Sollten Sie beim Bootvorgang keine andere Auswahl treffen, wird der "
-"Standardeintrag vom System gestartet."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Das Verändern von anderen Dingen kann zu einem unbrauchbaren System führen, "
-"das nicht mehr bootet. Bitte probieren Sie daher nicht einfach irgendetwas "
-"aus, ohne die Konsequenzen Ihrer Handlung zu kennen."
+"Falls Mageia das Betriebssystem ist, welches als erstes auf Ihrem Computer "
+"installiert wurde, wird das Installationsprogramm ein ESP (EFI System "
+"Partition) für den Bootloader (Grub2-efi) erstellt haben. Falls vor Mageia "
+"bereits ein anderes UEFI-Betriebssystem installiert war (z. B. Windows 8), "
+"wird das Mageia-Installationsprogramm die vorhandene ESP erkannt haben und "
+"ihr grub2-efi hinzugefügt haben. Obwohl es möglich ist, mehrere ESPs "
+"einzurichten, wird empfohlen, nur eine ESP zu verwenden - unabhängig von der "
+"Anzahl der installierten Betriebssysteme."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Mit einem UEFI System"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Verwenden des Mageia Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Falls Sie <code>Grub2-efi</code> als Bootloader ausgewählt haben, können Sie "
-"dieses Werkzeug nicht verwenden, um die Einträge zu bearbeiten. Sie müssen "
-"stattdessen <code>/boot/grub2/custom.cfg</code> manuell editieren oder "
-"<code>grub-customizer</code> verwenden. Sie haben hier lediglich die "
-"Möglichkeit, den Standard-Eintrag in einer Drop-Down-Liste auszuwählen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Nach einem Klick auf den <guibutton>Weiter</guibutton>-Knopf, kann über eine "
-"weitere Drop-Down-Liste die Bildschirmauflösung für Grub2, dem grafischen "
-"Bootloader, festgelegt werden."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Hauptoptionen des Bootloaders"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Verwenden eines bestehenden Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+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 "
+"Fällen nötig ist, das entsprechende Bootloader-Ladeprogramm auszuführen, das "
+"dann den Eintrag für Mageia automatisch finden und hinzufügen sollte. Sehen "
+"Sie dazu in der Dokumentation für das Betriebssystem nach, wenn noch Fragen "
+"offen sind."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Bevorzugen Sie verschiedene Einstellungen des Bootloaders, die automatisch "
-"vom Installationsprogramm gewählt werden sollen, so können Sie diese hier "
-"ändern."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Es befindet sich bereits ein anderes Betriebssystem auf Ihrem Computer, so "
-"dass in diesem Falle zu entscheiden ist, ob Mageia in den bereits "
-"bestehenden Bootloader eingefügt werden soll, oder ob es Mageia erlaubt "
-"werden soll, einen neuen Bootloader zu erstellen."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Die grafischen Menüs von Mageia sind schön:"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Verwenden des Mageia Bootloaders"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Als Vorgabe schreibt Mageia einen neuen GRUB (legacy)-Bootloader in den MBR "
-"(Master Boot Record) Ihres ersten Laufwerks. Sind bereits andere "
-"Betriebssysteme installiert, versucht Mageia, diese in das neue Mageia-"
-"Startmenü einzufügen."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
-"Mageia bietet jetzt neben GRUB legacy optional auch GRUB2 als Bootloader an."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
-"Linux Systeme die GRUB2 als Bootloader verwenden, werden im Augenblick nicht "
-"von GRUB (legacy) unterstützt und werden auch nicht vom GRUB legacy "
-"Bootloader erkannt."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Die beste Lösung ist hier, GRUB2 als Bootloader zu verwenden wie es auf der "
-"Zusammenfassungs-Seite empfohlen wird."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Verwenden eines bestehenden Bootloaders"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Wenn Sie sich dafür entscheiden, einen bestehenden Bootloader zu verwenden, "
-"dann dürfen Sie nicht vergessen, während der Installation an der Seite "
-"\"Zusammenfassung\" zu STOPPEN und auf den Knopf <guibutton>Bootloader "
-"einrichten</guibutton> zu klicken, der es Ihnen erlaubt, den "
-"Installationsort des Bootloaders zu ändern."
+"<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."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Dienste</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Wählen Sie kein Gerät, wie z.B.\"sda\", oder Sie überschreiben Ihren "
-"bestehenden MBR. Sie müssen die Wurzel-Partition wählen, die Sie zuvor "
-"während der Partitionierungsphase gewählt haben, z.B. sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Um es noch einmal klar darzustellen, \"sda\" ist ein Gerät, \"sda7\" ist "
-"eine Partition."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Wechseln Sie mit <emphasis role=\"bold\">Strg+Alt+F2</emphasis> zu <emphasis "
-"role=\"bold\">tty2</emphasis> und geben Sie <literal>df</literal> ein, um zu "
-"überprüfen, wo Ihre <literal>/</literal> (Wurzel)-Partition zu finden ist. "
-"<emphasis role=\"bold\">Strg+Alt+F7</emphasis> bringt Sie wieder zum "
-"Installationsbildschirm zurück."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"Fällen nötig ist, das entsprechende Bootloader-Ladeprogramm auszuführen, das "
-"dann den Eintrag für Mageia automatisch finden und hinzufügen sollte. Sehen "
-"Sie dazu in der Dokumentation für das Betriebssystem nach, wenn noch Fragen "
-"offen sind."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Erweiterte Optionen für den Bootloader"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Besitzen Sie für das Wurzelverzeichnis ( / ) nur einen sehr eingeschränkten "
-"Platz auf dem Laufwerk, worin <literal>/tmp</literal> enthalten ist, klicken "
-"Sie auf <guibutton>Fortgeschritten</guibutton> und markieren Sie das "
-"Ankreuzfeld für <guilabel>\"/tmp\" bei jedem Systemstart säubern</guilabel>. "
-"Dies hilft Ihnen, mehr Platz frei zu halten."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Bei einem UEFI-System ist die Benutzungsoberfläche etwas anders, da Sie den "
-"Bootloader nicht auswählen können weil nur Grub2-efi verfügbar ist."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Falls Mageia das Betriebssystem ist, welches als erstes auf Ihrem Computer "
-"installiert wurde, wird das Installationsprogramm ein ESP (EFI System "
-"Partition) für den Bootloader (Grub2-efi) erstellt haben. Falls vor Mageia "
-"bereits ein anderes UEFI-Betriebssystem installiert war (z. B. Windows 8), "
-"wird das Mageia-Installationsprogramm die vorhandene ESP erkannt haben und "
-"ihr grub2-efi hinzugefügt haben. Obwohl es möglich ist, mehrere ESPs "
-"einzurichten, wird empfohlen, nur eine ESP zu verwenden - unabhängig von der "
-"Anzahl der installierten Betriebssysteme."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Änderen Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4788,22 +4889,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "Danach sollte DrakX die Laufwerke korrekt konfigurieren können."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Soundkonfiguration"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4813,7 +4915,7 @@ msgstr ""
 "Soundkarte gewählt hat, welches der Standardtreiber ist"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4829,7 +4931,7 @@ msgstr ""
 "aus."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4840,12 +4942,12 @@ msgstr ""
 "guibutton> um hilfreiche Hinweise zu bekommen, wie das Problem zu lösen ist."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4857,7 +4959,7 @@ msgstr ""
 "den falschen ausgewählt hat."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -5035,12 +5137,12 @@ msgid "Uninstalling Mageia"
 msgstr "Mageia deinstallieren"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Kurzanleitung"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -5052,7 +5154,7 @@ msgstr ""
 "nicht auf jedes Betriebssystem zu."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -5064,7 +5166,7 @@ msgstr ""
 "auszuwählen."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -5084,7 +5186,7 @@ msgstr ""
 "wird freigegeben."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -5094,7 +5196,7 @@ msgstr ""
 "erhalten."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -5155,3 +5257,317 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Allerdings wird jeder Nutzer, der in <emphasis>MCC - System - Verwalte "
+#~ "Nutzer im System </emphasis>hinzugefügt wird, ein sowohl lese- als auch "
+#~ "schreibgeschütztes home Verzeichnis besitzen."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Wenn Sie kein öffentlich zugängliches Home-Verzeichnis für alle haben "
+#~ "möchten, wird empfohlen, einen temporären Benutzer anzulegen und die "
+#~ "tatsächlichen Benutzer nach einem Neustart hinzuzufügen."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summary.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "Dual Arch DVD"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Beide Architekturen sind auf dem gleichen Medium vorhanden, die Auswahl "
+#~ "wird automatisch anhand der erkannten CPU getroffen."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Verwendet nur den Xfce-Desktop."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Nicht alle Sprachen sind verfügbar. (be, bg, ca, de, en, es, fr, it, mk, "
+#~ "pl, pt, ru, sv, uk) MUSS ÜBERPRÜFT WERDEN!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Es ist unfreie Software enthalten."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live-CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Nur 32-Bit."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live-CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Mit einem BIOS System"
+
+#~ 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."
+#~ msgstr ""
+#~ "Sie können einen Eintrag hinzufügen oder den vorher gewählten ändern, "
+#~ "indem Sie den entprechenden Knopf im <emphasis>Bootloader "
+#~ "Konfigurationsbildschirm</emphasis> drücken und die Einstellungen im "
+#~ "Fenster, welches darüber erscheint, verändern."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Falls Sie <code>Grub 2</code> als Bootloader ausgewählt haben, können Sie "
+#~ "dieses Werkzeug nicht verwenden um die Einträge zu bearbeiten. Drücke "
+#~ "'Weiter'. Sie müssen stattdessen <code>/boot/grub2/custom.cfg</code> "
+#~ "manuell editieren oder <code>grub-customizer</code> verwenden."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Einige risikofreie Dinge ändern die Bezeichnung eines Eintrags und "
+#~ "aktivieren das Kästchen, welches den Eintrag als Standard setzt."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Sie können die korrekte Versionsnummer eines Eintrags hinzufügen, oder "
+#~ "ihn vollständig umbenennen."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Sollten Sie beim Bootvorgang keine andere Auswahl treffen, wird der "
+#~ "Standardeintrag vom System gestartet."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Das Verändern von anderen Dingen kann zu einem unbrauchbaren System "
+#~ "führen, das nicht mehr bootet. Bitte probieren Sie daher nicht einfach "
+#~ "irgendetwas aus, ohne die Konsequenzen Ihrer Handlung zu kennen."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Falls Sie <code>Grub2-efi</code> als Bootloader ausgewählt haben, können "
+#~ "Sie dieses Werkzeug nicht verwenden, um die Einträge zu bearbeiten. Sie "
+#~ "müssen stattdessen <code>/boot/grub2/custom.cfg</code> manuell editieren "
+#~ "oder <code>grub-customizer</code> verwenden. Sie haben hier lediglich die "
+#~ "Möglichkeit, den Standard-Eintrag in einer Drop-Down-Liste auszuwählen."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Nach einem Klick auf den <guibutton>Weiter</guibutton>-Knopf, kann über "
+#~ "eine weitere Drop-Down-Liste die Bildschirmauflösung für Grub2, dem "
+#~ "grafischen Bootloader, festgelegt werden."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Bevorzugen Sie verschiedene Einstellungen des Bootloaders, die "
+#~ "automatisch vom Installationsprogramm gewählt werden sollen, so können "
+#~ "Sie diese hier ändern."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Es befindet sich bereits ein anderes Betriebssystem auf Ihrem Computer, "
+#~ "so dass in diesem Falle zu entscheiden ist, ob Mageia in den bereits "
+#~ "bestehenden Bootloader eingefügt werden soll, oder ob es Mageia erlaubt "
+#~ "werden soll, einen neuen Bootloader zu erstellen."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Als Vorgabe schreibt Mageia einen neuen GRUB (legacy)-Bootloader in den "
+#~ "MBR (Master Boot Record) Ihres ersten Laufwerks. Sind bereits andere "
+#~ "Betriebssysteme installiert, versucht Mageia, diese in das neue Mageia-"
+#~ "Startmenü einzufügen."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia bietet jetzt neben GRUB legacy optional auch GRUB2 als Bootloader "
+#~ "an."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linux Systeme die GRUB2 als Bootloader verwenden, werden im Augenblick "
+#~ "nicht von GRUB (legacy) unterstützt und werden auch nicht vom GRUB legacy "
+#~ "Bootloader erkannt."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Die beste Lösung ist hier, GRUB2 als Bootloader zu verwenden wie es auf "
+#~ "der Zusammenfassungs-Seite empfohlen wird."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Wenn Sie sich dafür entscheiden, einen bestehenden Bootloader zu "
+#~ "verwenden, dann dürfen Sie nicht vergessen, während der Installation an "
+#~ "der Seite \"Zusammenfassung\" zu STOPPEN und auf den Knopf "
+#~ "<guibutton>Bootloader einrichten</guibutton> zu klicken, der es Ihnen "
+#~ "erlaubt, den Installationsort des Bootloaders zu ändern."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Wählen Sie kein Gerät, wie z.B.\"sda\", oder Sie überschreiben Ihren "
+#~ "bestehenden MBR. Sie müssen die Wurzel-Partition wählen, die Sie zuvor "
+#~ "während der Partitionierungsphase gewählt haben, z.B. sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Um es noch einmal klar darzustellen, \"sda\" ist ein Gerät, \"sda7\" ist "
+#~ "eine Partition."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Wechseln Sie mit <emphasis role=\"bold\">Strg+Alt+F2</emphasis> zu "
+#~ "<emphasis role=\"bold\">tty2</emphasis> und geben Sie <literal>df</"
+#~ "literal> ein, um zu überprüfen, wo Ihre <literal>/</literal> (Wurzel)-"
+#~ "Partition zu finden ist. <emphasis role=\"bold\">Strg+Alt+F7</emphasis> "
+#~ "bringt Sie wieder zum Installationsbildschirm zurück."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Erweiterte Optionen für den Bootloader"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Besitzen Sie für das Wurzelverzeichnis ( / ) nur einen sehr "
+#~ "eingeschränkten Platz auf dem Laufwerk, worin <literal>/tmp</literal> "
+#~ "enthalten ist, klicken Sie auf <guibutton>Fortgeschritten</guibutton> und "
+#~ "markieren Sie das Ankreuzfeld für <guilabel>\"/tmp\" bei jedem "
+#~ "Systemstart säubern</guilabel>. Dies hilft Ihnen, mehr Platz frei zu "
+#~ "halten."
diff --git a/docs/installer/el.po b/docs/installer/el.po
index eec8da33..3b8a02a1 100644
--- a/docs/installer/el.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:34+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -184,26 +184,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Διαχείριση χρήστη και διαχειριστή"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -211,12 +200,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ορίστε τον κωδικό πρόσβασης του διαχειριστή (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -238,7 +227,7 @@ msgstr ""
 "συγκρίνοντάς τους."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -248,12 +237,12 @@ msgstr ""
 "σε έναν κωδικό."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Εισαγωγή ενός χρήστη"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -265,7 +254,7 @@ msgstr ""
 "οτιδήποτε άλλο κάνει ένας μέσος χρήστης με τον υπολογιστή του."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -274,7 +263,7 @@ msgstr ""
 "αλλάξει το εικονίδιο του χρήστη."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -283,7 +272,7 @@ msgstr ""
 "χρήστη σε αυτό το πλαίσιο κειμένου."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -295,7 +284,7 @@ msgstr ""
 "και κεφαλαίων.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -307,7 +296,7 @@ msgstr ""
 "κωδικός πρόσβασης του χρήστη. (Δείτε επίσης <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -319,42 +308,22 @@ msgstr ""
 "πρόσβασης του χρήστη."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Κάθε χρήστη που προσθέτετε κατά την εγκατάσταση της Mageia, θα έχει έναν "
 "κατάλογο αναγνώσιμο (αλλά όχι εγγράψιμο) από όλους."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Ωστόσο, όταν χρησιμοποιείτε την νέα σας εγκατάσταση, κάθε χρήστη που "
-"προσθέτετε από το <emphasis>MCC - Σύστημα - Διαχείριση χρηστών, στο σύστημα</"
-"emphasis> θα έχει έναν προσωπικό κατάλογο με προστασία εγγραφής και "
-"ανάγνωσης."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Αν δεν επιθυμείτε να έχετε έναν προσωπικό κατάλογο (/home) αναγνώσιμο από "
-"όλους για κανέναν, συστήνεται να προσθέσετε μόνο έναν προσωρινό χρήστη τώρα "
-"και να προσθέσετε τον πραγματικό(ούς) μετά την επανεκκίνηση."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Αν προτιμάτε ο προσωπικός κατάλογος να είναι αναγνώσιμος από όλους, ίσως να "
 "θέλετε να προσθέσετε όλους τους επιπλέον χρήστες από το βήμα "
@@ -362,18 +331,18 @@ msgstr ""
 "<emphasis>Διαχείριση χρηστών</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 "Οι άδειες πρόσβασης μπορούν επίσης να τροποποιηθούν και μετά την εγκατάσταση."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Προχωρημένη διαχείριση χρήστη"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -383,14 +352,14 @@ msgstr ""
 "για τον χρήστη που κάνετε προσθέτετε."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr ""
 "Επιπροσθέτως, μπορείτε να απενεργοποιήσετε ή να ενεργοποιήσετε ένα "
 "λογαριασμό επισκέπτη."
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -401,7 +370,7 @@ msgstr ""
 "Ο guest θα πρέπει να αποθηκεύει τα σημαντικά του αρχεία σε ένα stick USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -414,7 +383,7 @@ msgstr ""
 "τυπικούς χρήστες."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -425,7 +394,7 @@ msgstr ""
 "προηγούμενη οθόνη. Οι επιλογές είναι Bash, Dash και Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -436,7 +405,7 @@ msgstr ""
 "Μην εισάγετε κάτι εδώ αν δεν γνωρίζετε για το τι πρόκειται."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -823,12 +792,12 @@ msgstr ""
 "λειτουργίας Live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Επιλογή περιβάλλοντος εργασίας"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -837,7 +806,7 @@ msgstr ""
 "συνέχεια για επιπλέον επιλογές."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -848,16 +817,17 @@ msgstr ""
 "πατώντας στο κουμπί <guilabel>Λεπτομέρειες</guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -877,22 +847,23 @@ msgstr ""
 "εγκατεστημένα πακέτα από προεπιλογή."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Επιλογή ομάδας πακέτων"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -906,22 +877,22 @@ msgstr ""
 "ποντικιού από πάνω τους."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Σταθμός εργασίας."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Εξυπηρετητής."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Γραφικό περιβάλλον."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -930,10 +901,11 @@ msgstr ""
 "για την προσθήκη επιπλέον πακέτων χειροκίνητα."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Ανατρέξτε στο <xref linkend=\"minimal-install\"></xref> για οδηγίες σχετικά "
 "με το πώς να κάνετε μια ελάχιστη εγκατάσταση (δίχως ή με X &amp; IceWM)."
@@ -1422,23 +1394,24 @@ msgstr ""
 "είστε συντηρητικοί στις επιλογές σας."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Προσαρμοσμένη κατάτμηση δίσκων με το DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1451,7 +1424,7 @@ msgstr ""
 "δεν θα είναι δυνατή η εκκίνηση του υπολογιστή σας."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1463,7 +1436,7 @@ msgstr ""
 "περιεχόμενό της πριν να ξεκινήσετε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1473,7 +1446,7 @@ msgstr ""
 "τρία από αυτά."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1482,7 +1455,7 @@ msgstr ""
 "τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1492,44 +1465,79 @@ msgstr ""
 "προσάρτησης, αλλάξτε το μέγεθός της ή καθαρίστε την."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Συνεχίστε έως ότου ρυθμίσετε οτιδήποτε επιθυμείτε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Κάντε κλικ στο <guibutton>Έγινε</guibutton> όταν είστε έτοιμος-η."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Αν κάνετε εγκατάσταση της Mageia σε ένα σύστημα UEFI, ελέγξτε ότι μια "
+"κατάτμηση ESP (EFI System Partition) είναι παρούσα και προσαρτημένη σωστά "
+"στο /boot.EFI (δείτε ανωτέρω)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1540,7 +1548,7 @@ msgstr ""
 "μέρη εγκατάστασης της <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1549,21 +1557,32 @@ msgstr ""
 "ιδιότητες των σκληρών σας δίσκων και το περιεχόμενό τους."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Χρήση των υπαρχουσών κατατμήσεων"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1572,12 +1591,12 @@ msgstr ""
 "συμβατές με το Linux και μπορούν να χρησιμοποιηθούν για την εγκατάσταση."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Χρήση του ελεύθερου χώρου"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1586,12 +1605,12 @@ msgstr ""
 "θα τον χρησιμοποιήσει για τη νέα σας εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 msgid "Use Free Space on a Windows Partition"
 msgstr "Χρήση του ελεύθερου χώρου σε μια κατάτμηση των Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1600,7 +1619,7 @@ msgstr ""
 "οδηγός εγκατάστασης μπορεί να σας επιτρέψει να τον χρησιμοποιήσετε."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1610,7 +1629,7 @@ msgstr ""
 "εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1629,7 +1648,7 @@ msgstr ""
 "αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1643,7 +1662,7 @@ msgstr ""
 "διαστήματος μεταξύ των δυο κατατμήσεων. Δείτε στο παρακάτω στιγμιότυπο."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1651,25 +1670,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Διαγραφή και χρήση ολόκληρου του δίσκου."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Αυτή η επιλογή θα χρησιμοποιήσει ολόκληρο τον δίσκο για τη Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1680,12 +1709,12 @@ msgstr ""
 "τότε μην χρησιμοποιήσετε αυτήν την επιλογή."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Προσαρμοσμένο"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1694,13 +1723,13 @@ msgstr ""
 "σας δίσκους."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1709,7 +1738,7 @@ msgstr ""
 "ακόλουθων κανόνων:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1718,7 +1747,7 @@ msgstr ""
 "μόνο η ριζική κατάτμηση «/» και δεν θα"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1726,7 +1755,7 @@ msgstr ""
 "δημιουργούνται τρεις κατατμήσεις"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1734,21 +1763,21 @@ msgstr ""
 "μέγιστο χώρο 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 "και το υπόλοιπο (τουλάχιστον 12/19) εκχωρείται στον προσωπικό κατάλογο «/"
 "home» "
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1758,7 +1787,7 @@ msgstr ""
 "και το υπόλοιπο για το /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1770,8 +1799,48 @@ msgstr ""
 "στο /boot/EFI. Η «Προσαρμοσμένη» επιλογή είναι η μοναδική που επιτρέπει τον "
 "έλεγχο επικύρωσης."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1791,17 +1860,17 @@ msgstr ""
 "χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Στοίχιση σε\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1916,27 +1985,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1946,7 +2012,7 @@ msgstr ""
 "τώρα να επανεκκινήσετε τον υπολογιστή σας με ασφάλεια."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1956,7 +2022,7 @@ msgstr ""
 "περισσότερα από ένα)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1965,12 +2031,12 @@ msgstr ""
 "σας της Mageia θα επιλεχθεί αυτόματα και θα εκκινηθεί."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Απολαύστε!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2109,6 +2175,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2786,30 +2857,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Σύνοψη των διάφορων παραμέτρων"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2821,18 +2878,40 @@ msgstr ""
 "εντοπίστηκε από το DrakX. Μπορείτε να ελέγξετε τις ρυθμίσεις εδώ και αν "
 "θέλετε να τις αλλάξετε πατώντας <guibutton>Διαμόρφωση</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Παράμετροι του συστήματος"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Ζώνη ώρας:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2843,12 +2922,12 @@ msgstr ""
 "\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Χώρα / Περιοχή:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2857,37 +2936,37 @@ msgstr ""
 "ρύθμιση.  Δείτε <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Πρόγραμμα εκκίνησης:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 "Το DrakX έχει πραγματοποιήσει καλές επιλογές για τη ρύθμιση του προγράμματος "
 "εκκίνησης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr ""
 "Μην αλλάξετε τίποτα, αν δεν γνωρίζετε πως να διαμορφώσετε το Grub και/ή Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Διαχείριση χρηστών:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2896,12 +2975,12 @@ msgstr ""
 "του κατάλογο <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Υπηρεσίες</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2911,7 +2990,7 @@ msgstr ""
 "απενεργοποίηση ορισμένων εργασιών."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2920,23 +2999,23 @@ msgstr ""
 "μπορεί να προκαλέσει τη δυσλειτουργία του υπολογιστή σας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 "Για περισσότερες πληροφορίες, δείτε <xref linkend=\"configureServices\"/>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Παράμετροι υλικού"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Πληκτρολόγιο:</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2945,13 +3024,20 @@ msgstr ""
 "οποία εξαρτάται από την τοποθεσία σας, τη γλώσσα ή τον τύπο του "
 "πληκτρολογίου."
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Ποντίκι</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2960,12 +3046,12 @@ msgstr ""
 "ταμπλέτες, σφαιροδείκτες κλπ."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Κάρτα ήχου</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2977,45 +3063,47 @@ msgstr ""
 "αυτούς δεν είναι ο προκαθορισμένος."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Κάρτα γραφικών</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Παράμετροι δικτύου και διαδικτύου"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Δίκτυο</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -3028,7 +3116,7 @@ msgstr ""
 "τα αποθετήρια «nonfree»."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -3037,12 +3125,12 @@ msgstr ""
 "προστασίας για την εποπτεία των επαφών αυτών."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Διαμεσολαβητές</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -3053,7 +3141,7 @@ msgstr ""
 "υπολογιστή σας για την χρήση μιας υπηρεσίας διαμεσολαβητή."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -3062,17 +3150,17 @@ msgstr ""
 "λάβετε τις παραμέτρους που χρειάζεστε να εισάγετε εδώ"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Ασφάλεια"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Επίπεδο ασφάλειας</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3082,17 +3170,17 @@ msgstr ""
 "καταλληλότερο για γενική χρήση."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr "Επιλέξτε την επιλογή που ταιριάζει περισσότερο με τη χρήση σας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Τείχος προστασίας</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3102,10 +3190,12 @@ msgstr ""
 "εκθέσουν ή να τα κλέψουν."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Επιλέξτε τις υπηρεσίες που επιθυμείτε να έχετε πρόσβαση στο σύστημά σας. Οι "
 "επιλογές σας θα εξαρτώνται με τη χρήση που προορίζεται ο υπολογιστής σας."
@@ -3118,26 +3208,39 @@ msgstr ""
 "να είναι ριψοκίνδυνο."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Επανεκκίνηση"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Μετά το πέρας της εγκατάστασης του προγράμματος εκκίνησης, θα σας προταθεί "
+"να κλείσετε τον υπολογιστή, να αφαιρέσετε το live CD και να κάνετε "
+"επανεκκίνηση του υπολογιστή. Κατά την εκκίνηση θα παρατηρήσετε μια ακολουθία "
+"ράβδων προόδου λήψεων. Αυτό δείχνει ότι τα μέσα λογισμικού τηλεφορτώνονται "
+"(δείτε στην διαχείριση του λογισμικού)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Μετά το πέρας της εγκατάστασης του προγράμματος εκκίνησης, θα σας προταθεί "
 "να κλείσετε τον υπολογιστή, να αφαιρέσετε το live CD και να κάνετε "
@@ -3145,6 +3248,16 @@ msgstr ""
 "ράβδων προόδου λήψεων. Αυτό δείχνει ότι τα μέσα λογισμικού τηλεφορτώνονται "
 "(δείτε στην διαχείριση του λογισμικού)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3207,17 +3320,17 @@ msgstr ""
 "την ενότητα <guilabel>Ασφάλεια</guilabel> του Κέντρου Ελέγχου Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Επιλογή και χρήση των ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Εισαγωγή"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3226,12 +3339,12 @@ msgstr ""
 "επιλέξετε ποια εικόνα ταιριάζει στις ανάγκες σας."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Υπάρχουν δυο οικογένειες μέσων:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3245,7 +3358,7 @@ msgstr ""
 "εργασίας."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3257,22 +3370,22 @@ msgstr ""
 "αλλά με λιγότερες επιλογές."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr "Στις επόμενες ενότητες δίνονται περισσότερες πληροφορίες."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Μέσα"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Ορισμός"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3283,7 +3396,7 @@ msgstr ""
 "μέσο όπου το αρχείο ISO έχει αντιγραφεί."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3292,23 +3405,23 @@ msgstr ""
 "\">εδώ</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Μέσο κλασσικής εγκατάστασης"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Κοινά χαρακτηριστικά"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr "Τα ISO χρησιμοποιούν το παραδοσιακό πρόγραμμα εγκαταστάτης drakx."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3316,17 +3429,17 @@ msgstr ""
 "προηγούμενη έκδοση."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 ή 64 bit."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3335,57 +3448,24 @@ msgstr ""
 "Έλεγχος της μνήμης, Εργαλείο εντοπισμού υλικού."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Κατά την εγκατάσταση θα ερωτηθείτε για την προσθήκη ιδιόκτητου λογισμικού."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD διπλής αρχιτεκτονικής"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Και οι δυο αρχιτεκτονικές περιέχονται στο μέσο, η επιλογή γίνεται αυτόματα "
-"βάσει τον εντοπισμό του επεξεργαστή."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Δεν είναι διαθέσιμες όλες οι γλώσσες. (be, bg, ca, de, en, es, fr, it, mk, "
-"pl, pt, ru, sv, uk) ΠΡΟΣ ΕΠΙΒΕΒΑΙΩΣΗ!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Περιέχει ιδιόκτητο λογισμικό."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Μέσο Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3395,18 +3475,20 @@ msgstr ""
 "στον σκληρό δίσκο."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Κάθε ISO περιέχει μόνο ένα περιβάλλον εργασίας (KDE ή GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "Διαφορετικά μέσα για αρχιτεκτονική 32 ή 64 bit."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3417,63 +3499,57 @@ msgstr ""
 "προηγούμενη έκδοση.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Περιέχουν ιδιόκτητο λογισμικό."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Μόνο Αγγλική γλώσσα."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Μόνο 32-bit."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Περιέχονται όλες οι γλώσσες."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Περιέχονται όλες οι γλώσσες."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "CD αποκλειστικά για εκκίνηση"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3488,7 +3564,7 @@ msgstr ""
 "διαδίκτυο."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3499,13 +3575,19 @@ msgstr ""
 "υπολογιστής δεν διαθέτει οδηγό DVD ή όταν ο υπολογιστής δεν υποστηρίζει την "
 "εκκίνηση από ένα κλειδί USB. "
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "Μόνο Αγγλική γλώσσα."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Εκκίνηση της εγκατάστασης"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3514,12 +3596,13 @@ msgstr ""
 "χρησιμοποιήσουν ιδιόκτητο λογισμικό."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3528,17 +3611,17 @@ msgstr ""
 "για αυτούς που το χρειάζονται."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Λήψη και έλεγχος των μέσων"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Λήψη"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3552,12 +3635,12 @@ msgstr ""
 "επιλέξετε http, μπορεί να δείτε επίσης κάτι σαν αυτό"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3568,22 +3651,22 @@ msgstr ""
 "\">μελλοντική χρήση</link>. Στη συνέχεια ανοίγει αυτό το παράθυρο:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Επιλέξτε το κουμπί επιλογών Αποθήκευση του αρχείου."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Έλεγχος της ακεραιότητας του ληφθέντος αρχείου"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3599,12 +3682,12 @@ msgstr ""
 "προσπαθήσετε την εκ νέου λήψη του αρχείου."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr "Ανοίξτε ένα τερματικό －δεν χρειάζεται σύνδεση ως root － και:"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3613,7 +3696,7 @@ msgstr ""
 "path/to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3622,7 +3705,7 @@ msgstr ""
 "path/to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3631,17 +3714,17 @@ msgstr ""
 "να περιμένετε λίγο) με τον αριθμό που δίνεται από τη Mageia. Για παράδειγμα:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Εγγραφή ή αποτύπωση του ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3651,12 +3734,12 @@ msgstr ""
 "σκοπεύουν στην δημιουργία ενός εκκινήσιμου μέσου."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Εγγραφή του ISO σε ένα CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3671,12 +3754,12 @@ msgstr ""
 "wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "Αποτύπωση του ISO σε ένα κλειδί USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3686,7 +3769,7 @@ msgstr ""
 "και εγκατάσταση του συστήματος."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3698,7 +3781,7 @@ msgstr ""
 "της εικόνας ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3707,12 +3790,12 @@ msgstr ""
 "νέου την κατάτμηση και την μορφοποίηση του κλειδιού USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στην Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3722,17 +3805,17 @@ msgstr ""
 "IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr "Χρήση ενός εργαλείου γραφικού περιβάλλοντος στα Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Μπορείτε να δοκιμάσετε:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3741,7 +3824,7 @@ msgstr ""
 "χρησιμοποιώντας την επιλογή της «εικόνας ISO»·"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3750,12 +3833,12 @@ msgstr ""
 "\">Win32 Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Χρήση της γραμμής εντολών σε ένα σύστημα GNU/Linux "
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3765,17 +3848,17 @@ msgstr ""
 "λανθασμένα το αναγνωριστικό της συσκευής."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Ανοίξτε ένα τερματικό"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3784,12 +3867,12 @@ msgstr ""
 "ξεχάσετε το τελικό «-» )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3799,17 +3882,17 @@ msgstr ""
 "κλειδί)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3820,7 +3903,7 @@ msgstr ""
 "<emphasis>sd</emphasis>, και <emphasis>sdd</emphasis> στην περίπτωσή μας:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3862,7 +3945,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3872,7 +3955,7 @@ msgstr ""
 "ένα κλειδί USB 8GB."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3881,12 +3964,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Όπου «X» = το όνομα της συσκευής, πχ: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3895,37 +3978,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Εισάγετε την εντολή: # <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Αποσυνδέστε το κλειδί USB, όλα ολοκληρώθηκαν"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Επιλέξτε τη χώρα/περιοχή σας"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3933,7 +4016,7 @@ msgstr ""
 "ρυθμίσεων, όπως το νόμισμα και ο κανονιστικός τομέας ασύρματου δικτύου."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3943,7 +4026,7 @@ msgstr ""
 "περιοχή.<guilabel></guilabel>"
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3957,21 +4040,20 @@ msgstr ""
 "πραγματική σας επιλογή."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Μέθοδος εισαγωγής"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 ""
 "Στην οθόνη <emphasis role=\"bold\">Άλλες χώρες</emphasis> μπορείτε επίσης να "
 "επιλέξετε τη μέθοδο εισαγωγής (στο κάτω μέρος της λίστας). Οι μέθοδοι "
@@ -3985,10 +4067,11 @@ msgstr ""
 "προσθέσατε ένα μέσο HTTP/FTP πριν την επιλογή των πακέτων."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Αν παραλείψατε τη ρύθμιση της μεθόδου εισαγωγής κατά την εγκατάσταση, "
@@ -4334,367 +4417,396 @@ msgstr ""
 "έξι ή περισσότερα κουμπιά."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Προσθήκη ή επεξεργασία μιας καταχώρησης στο μενού Εκκίνησης"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Για περισσότερες πληροφορίες σχετικά με τις επιλογές του πυρήνα σε παλαιά "
+"και UEFI συστήματα, δείτε: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Με ένα σύστημα Bios"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Μπορείτε να προσθέσετε μια καταχώρηση ή να επεξεργαστείτε αυτή που "
-"επιλέξατε, πατώντας στο σχετικό κουμπί στη <emphasis>Διαμόρφωση του "
-"προγράμματος εκκίνησης</emphasis> και να επεξεργαστείτε τα πεδία στον "
-"αναδυόμενο διάλογο."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Με ένα σύστημα UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Αν έχετε επιλέξει <code>Grub 2</code> ως πρόγραμμα εκκίνησης, δεν μπορείτε "
-"να χρησιμοποιήσετε αυτό το εργαλείο για την επεξεργασία των καταχωρήσεων σε "
-"αυτό το στάδιο. Πιέστε στο «Επόμενο». Θα χρειαστείτε να επεξεργαστείτε "
-"χειροκίνητα το <code>/boot/grub2/custom.cfg</code> ή χρησιμοποιήστε το "
-"<code>grub-customizer</code>."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+"Μην τροποποιήσετε το περιφερειακό εκκίνησης εκτός και αν γνωρίζεται τι "
+"ακριβώς πράττετε."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Με ένα σύστημα UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Μερικά πράγματα που μπορούν να γίνουν χωρίς κίνδυνο, είναι η αλλαγή της "
-"ετικέτας μιας καταχώρησης και η επιλογή μιας καταχώρησης ως την "
-"προκαθορισμένη."
+"Με ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς διαφορετικό όπως ότι "
+"δεν μπορείτε να επιλέξετε το πρόγραμμα εκκίνησης αφού μόνο το Grub2-efi "
+"είναι διαθέσιμο."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Μπορείτε να προσθέσετε τον σωστό αριθμό έκδοσης μιας καταχώρησης, ή να την "
-"μετονομάσετε πλήρως."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Η προκαθορισμένη καταχώρηση είναι αυτή στην οποία ξεκινά ο υπολογιστής αν "
-"δεν επιλέξετε κάποια άλλη καταχώρηση στην εκκίνηση."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Η επεξεργασία άλλων πεδίων μπορεί να έχει ως αποτέλεσμα την αδυναμία "
-"εκκίνησης του συστήματός σας. Παρακαλώ μην κάνετε απλά δοκιμές αν δεν "
-"γνωρίζετε τι ακριβώς κάνετε."
+"Αν η Mageia είναι το πρώτο σύστημα εγκατεστημένο στον υπολογιστή σας, το "
+"πρόγραμμα εγκατάστασης δημιούργησε μια κατάτμηση ESP (EFI System Partition) "
+"για την υποδοχή του προγράμματος εκκίνησης (Grub2-efi). Αν έχετε ήδη "
+"εγκατεστημένα UEFI συστήματα (π.χ. Windows 8), το πρόγραμμα εγκατάστασης της "
+"Mageia θα εντοπίσει τις υπάρχουσες κατατμήσεις ESP που έχουν δημιουργηθεί "
+"από τα Windows και θα προσθέσει το grub2-efi. Μολονότι είναι δυνατή η "
+"συνύπαρξη περισσοτέρων κατατμήσεων ESP, συνιστάται η χρήση μιας ανεξαρτήτου "
+"του αριθμού των λειτουργικών συστημάτων που διαθέτετε."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Με ένα σύστημα UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Σε αυτήν την περίπτωση χρησιμοποιείτε Grub2-efi και δεν μπορείτε να "
-"χρησιμοποιήσετε αυτό το εργαλείο για την επεξεργασία των καταχωρήσεων σε "
-"αυτό το στάδιο. Για να το κάνετε αυτό θα πρέπει να επεξεργαστείτε "
-"χειροκίνητα το <code>/boot/grub2/custom.cfg</code> ή χρησιμοποιήστε το "
-"<code>grub-customizer</code>. Όλα όσα μπορείτε να κάνετε εδώ είναι να "
-"επιλέξετε την εξ ορισμού καταχώρηση από την αναπτυσσόμενη λίστα."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Μετά το κλικ στο κουμπί <guibutton>Επόμενο</guibutton>, μια άλλη "
-"αναπτυσσόμενη λίστα σας επιτρέπει να επιλέξετε την ανάλυση γραφικών για το "
-"Grub2 οι οποίος είναι ένα πρόγραμμα εκκίνησης γραφικού περιβάλλοντος.  "
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Κύριες επιλογές του προγράμματος εκκίνησης"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+"Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον "
+"πρόγραμμα εκκίνησης δεν είναι το αντικείμενο σε αυτήν τη Βοήθεια, ωστόσο "
+"στις περισσότερες περιπτώσεις αυτό θα επιφέρει την εκτέλεση του προγράμματος "
+"εγκατάστασης του εν λόγω μενού εκκίνησης, το οποίο θα πρέπει να εντοπίσει "
+"αυτόματα το σύστημα Mageia και να το εγκαταστήσει. Δείτε στην τεκμηρίωση του "
+"εν λόγω λειτουργικού συστήματος."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Αν δεν σας ικανοποιούν οι ρυθμίσεις που έχει κάνει το DrakX για το πρόγραμμα "
-"εκκίνησης, μπορείτε να τις αλλάξετε από εδώ."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Ίσως να έχετε ήδη ένα άλλο λειτουργικό σύστημα στον υπολογιστή σας, σε αυτήν "
-"την περίπτωση θα πρέπει να αποφασίσετε αν θα γίνει προσθήκη της Mageia στο "
-"υπάρχον πρόγραμμα εκκίνησης, ή αν θα επιτρέψετε στη Mageia να δημιουργήσει "
-"ένα νέο."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Τα γραφικά μενού της Mageia είναι πολύ όμορφα:"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Από προεπιλογή η Mageia δημιουργεί ένα νέο πρόγραμμα εκκίνησης GRUB (legacy) "
-"στο MBR (Master Boot Record) του πρώτου σας σκληρού δίσκου. Αν έχετε ήδη "
-"εγκατεστημένα άλλα λειτουργικά συστήματα, η Mageia προσπαθεί να τα "
-"συμπεριλάβει στο νέο μενού εκκίνησης της Mageia."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Η Mageia τώρα προσφέρει επίσης το GRUB2 ως προαιρετικό πρόγραμμα εκκίνησης "
-"επιπρόσθετα του GRUB legacy και του Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Τα συστήματα Linux που χρησιμοποιούν GRUB2 δεν υποστηρίζονται αυτή τη στιγμή "
-"από το GRUB (legacy) και δεν θα αναγνωριστούν αν χρησιμοποιείτε το "
-"προκαθορισμένο GRUB."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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."
 msgstr ""
-"Η καλύτερη λύση για αυτό είναι η χρήση του GRUB2 που είναι διαθέσιμο από τη "
-"σελίδα σύνοψης στα βήματα της εγκατάστασης."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Αν αποφασίσετε να χρησιμοποιήσετε ένα υπάρχον μενού εκκίνησης τότε θα πρέπει "
-"να θυμηθείτε να ΣΤΑΜΑΤΗΣΕΤΕ στη σελίδα σύνοψης κατά την εγκατάσταση και να "
-"κάνετε κλικ στο κουμπί <guibutton>Διαμόρφωσης</guibutton> του προγράμματος "
-"εκκίνησης, το οποίο θα σας επιτρέψει να αλλάξετε την τοποθεσία εγκατάστασης "
-"του προγράμματος εκκίνησης."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Μην επιλέξετε μια συσκευή π.χ. «sda», διαφορετικά θα αντικαταστήσετε το "
-"υπάρχον σας MBR.  Πρέπει να επιλέξετε την κατάτμηση root που επιλέξατε κατά "
-"τον διαμερισμό νωρίτερα π.χ. sda7."
+"<guilabel>Κωδικός πρόσβασης (ξανά)</guilabel>: Επαναλάβετε εδώ την "
+"πληκτρολόγηση του κωδικού πρόσβασης του χρήστη και το drakx θα ελέγξει ότι "
+"έχετε πληκτρολογήσει τον ίδιο κωδικό σε όλα τα πεδία εισαγωγής κωδικού "
+"πρόσβασης του χρήστη."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Δηλαδή, το sda είναι μια συσκευή, και το sda7 είναι μια κατάτμηση."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Υπηρεσίες</guilabel>:"
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Μεταβείτε στο tty2 με Ctrl+Alt+F2 και πληκτρολογήστε <literal>df</literal> "
-"για να ελέγξετε που βρίσκεται η κατάτμηση <literal>/</literal> (root). Με "
-"Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Η ακριβής διαδικασία για να προσθέσετε το σύστημά σας Mageia σε ένα υπάρχον "
-"πρόγραμμα εκκίνησης δεν είναι το αντικείμενο σε αυτήν τη Βοήθεια, ωστόσο "
-"στις περισσότερες περιπτώσεις αυτό θα επιφέρει την εκτέλεση του προγράμματος "
-"εγκατάστασης του εν λόγω μενού εκκίνησης, το οποίο θα πρέπει να εντοπίσει "
-"αυτόματα το σύστημα Mageia και να το εγκαταστήσει. Δείτε στην τεκμηρίωση του "
-"εν λόγω λειτουργικού συστήματος."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Προχωρημένη λειτουργία του προγράμματος εκκίνησης"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Αν έχετε περιορισμένο χώρο στο δίσκο για την κατάτμηση <literal>/</literal> "
-"που περιέχει <literal>/tmp</literal>, κάντε κλικ στο <guibutton>Για "
-"προχωρημένους</guibutton> και επιλέξτε το πλαίσιο για <guilabel>Καθαρισμό "
-"του /tmp σε κάθε εκκίνηση</guilabel>. Αυτό βοηθά στη διατήρηση κάποιου "
-"ελεύθερου χώρου."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Με ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς διαφορετικό όπως ότι "
-"δεν μπορείτε να επιλέξετε το πρόγραμμα εκκίνησης αφού μόνο το Grub2-efi "
-"είναι διαθέσιμο."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Αν η Mageia είναι το πρώτο σύστημα εγκατεστημένο στον υπολογιστή σας, το "
-"πρόγραμμα εγκατάστασης δημιούργησε μια κατάτμηση ESP (EFI System Partition) "
-"για την υποδοχή του προγράμματος εκκίνησης (Grub2-efi). Αν έχετε ήδη "
-"εγκατεστημένα UEFI συστήματα (π.χ. Windows 8), το πρόγραμμα εγκατάστασης της "
-"Mageia θα εντοπίσει τις υπάρχουσες κατατμήσεις ESP που έχουν δημιουργηθεί "
-"από τα Windows και θα προσθέσει το grub2-efi. Μολονότι είναι δυνατή η "
-"συνύπαρξη περισσοτέρων κατατμήσεων ESP, συνιστάται η χρήση μιας ανεξαρτήτου "
-"του αριθμού των λειτουργικών συστημάτων που διαθέτετε."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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
@@ -4747,22 +4859,23 @@ msgstr ""
 "λειτουργία."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Ρύθμιση του ήχου"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4773,7 +4886,7 @@ msgstr ""
 "αν έχουμε έναν."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4789,7 +4902,7 @@ msgstr ""
 "μέρος της οθόνης. "
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4801,12 +4914,12 @@ msgstr ""
 "πληροφορίες επίλυσης του προβλήματος."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4818,7 +4931,7 @@ msgstr ""
 "οδηγός, ή πιστεύετε ότι ο εγκαταστάτης επέλεξε έναν λανθασμένα. "
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4993,12 +5106,12 @@ msgid "Uninstalling Mageia"
 msgstr "Απεγκατάσταση της Mageia "
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Οδηγίες"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -5010,7 +5123,7 @@ msgstr ""
 "λειτουργικών συστημάτων."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -5022,7 +5135,7 @@ msgstr ""
 "Windows ως επιλογή."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -5042,7 +5155,7 @@ msgstr ""
 "απελευθερωθεί."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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,7 +5165,7 @@ msgstr ""
 "κατάτμησης."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -5114,6 +5227,317 @@ msgstr ""
 "λίγο, είναι κανονικό."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Ωστόσο, όταν χρησιμοποιείτε την νέα σας εγκατάσταση, κάθε χρήστη που "
+#~ "προσθέτετε από το <emphasis>MCC - Σύστημα - Διαχείριση χρηστών, στο "
+#~ "σύστημα</emphasis> θα έχει έναν προσωπικό κατάλογο με προστασία εγγραφής "
+#~ "και ανάγνωσης."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Αν δεν επιθυμείτε να έχετε έναν προσωπικό κατάλογο (/home) αναγνώσιμο από "
+#~ "όλους για κανέναν, συστήνεται να προσθέσετε μόνο έναν προσωρινό χρήστη "
+#~ "τώρα και να προσθέσετε τον πραγματικό(ούς) μετά την επανεκκίνηση."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD διπλής αρχιτεκτονικής"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Και οι δυο αρχιτεκτονικές περιέχονται στο μέσο, η επιλογή γίνεται "
+#~ "αυτόματα βάσει τον εντοπισμό του επεξεργαστή."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Μόνο το περιβάλλον επιφάνειας εργασίας Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Δεν είναι διαθέσιμες όλες οι γλώσσες. (be, bg, ca, de, en, es, fr, it, "
+#~ "mk, pl, pt, ru, sv, uk) ΠΡΟΣ ΕΠΙΒΕΒΑΙΩΣΗ!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Περιέχει ιδιόκτητο λογισμικό."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Μόνο 32-bit."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Με ένα σύστημα Bios"
+
+#~ 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."
+#~ msgstr ""
+#~ "Μπορείτε να προσθέσετε μια καταχώρηση ή να επεξεργαστείτε αυτή που "
+#~ "επιλέξατε, πατώντας στο σχετικό κουμπί στη <emphasis>Διαμόρφωση του "
+#~ "προγράμματος εκκίνησης</emphasis> και να επεξεργαστείτε τα πεδία στον "
+#~ "αναδυόμενο διάλογο."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Αν έχετε επιλέξει <code>Grub 2</code> ως πρόγραμμα εκκίνησης, δεν "
+#~ "μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για την επεξεργασία των "
+#~ "καταχωρήσεων σε αυτό το στάδιο. Πιέστε στο «Επόμενο». Θα χρειαστείτε να "
+#~ "επεξεργαστείτε χειροκίνητα το <code>/boot/grub2/custom.cfg</code> ή "
+#~ "χρησιμοποιήστε το <code>grub-customizer</code>."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Μερικά πράγματα που μπορούν να γίνουν χωρίς κίνδυνο, είναι η αλλαγή της "
+#~ "ετικέτας μιας καταχώρησης και η επιλογή μιας καταχώρησης ως την "
+#~ "προκαθορισμένη."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Μπορείτε να προσθέσετε τον σωστό αριθμό έκδοσης μιας καταχώρησης, ή να "
+#~ "την μετονομάσετε πλήρως."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Η προκαθορισμένη καταχώρηση είναι αυτή στην οποία ξεκινά ο υπολογιστής αν "
+#~ "δεν επιλέξετε κάποια άλλη καταχώρηση στην εκκίνηση."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Η επεξεργασία άλλων πεδίων μπορεί να έχει ως αποτέλεσμα την αδυναμία "
+#~ "εκκίνησης του συστήματός σας. Παρακαλώ μην κάνετε απλά δοκιμές αν δεν "
+#~ "γνωρίζετε τι ακριβώς κάνετε."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Σε αυτήν την περίπτωση χρησιμοποιείτε Grub2-efi και δεν μπορείτε να "
+#~ "χρησιμοποιήσετε αυτό το εργαλείο για την επεξεργασία των καταχωρήσεων σε "
+#~ "αυτό το στάδιο. Για να το κάνετε αυτό θα πρέπει να επεξεργαστείτε "
+#~ "χειροκίνητα το <code>/boot/grub2/custom.cfg</code> ή χρησιμοποιήστε το "
+#~ "<code>grub-customizer</code>. Όλα όσα μπορείτε να κάνετε εδώ είναι να "
+#~ "επιλέξετε την εξ ορισμού καταχώρηση από την αναπτυσσόμενη λίστα."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Μετά το κλικ στο κουμπί <guibutton>Επόμενο</guibutton>, μια άλλη "
+#~ "αναπτυσσόμενη λίστα σας επιτρέπει να επιλέξετε την ανάλυση γραφικών για "
+#~ "το Grub2 οι οποίος είναι ένα πρόγραμμα εκκίνησης γραφικού περιβάλλοντος.  "
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Αν δεν σας ικανοποιούν οι ρυθμίσεις που έχει κάνει το DrakX για το "
+#~ "πρόγραμμα εκκίνησης, μπορείτε να τις αλλάξετε από εδώ."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Ίσως να έχετε ήδη ένα άλλο λειτουργικό σύστημα στον υπολογιστή σας, σε "
+#~ "αυτήν την περίπτωση θα πρέπει να αποφασίσετε αν θα γίνει προσθήκη της "
+#~ "Mageia στο υπάρχον πρόγραμμα εκκίνησης, ή αν θα επιτρέψετε στη Mageia να "
+#~ "δημιουργήσει ένα νέο."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Από προεπιλογή η Mageia δημιουργεί ένα νέο πρόγραμμα εκκίνησης GRUB "
+#~ "(legacy) στο MBR (Master Boot Record) του πρώτου σας σκληρού δίσκου. Αν "
+#~ "έχετε ήδη εγκατεστημένα άλλα λειτουργικά συστήματα, η Mageia προσπαθεί να "
+#~ "τα συμπεριλάβει στο νέο μενού εκκίνησης της Mageia."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Η Mageia τώρα προσφέρει επίσης το GRUB2 ως προαιρετικό πρόγραμμα "
+#~ "εκκίνησης επιπρόσθετα του GRUB legacy και του Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Τα συστήματα Linux που χρησιμοποιούν GRUB2 δεν υποστηρίζονται αυτή τη "
+#~ "στιγμή από το GRUB (legacy) και δεν θα αναγνωριστούν αν χρησιμοποιείτε το "
+#~ "προκαθορισμένο GRUB."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Η καλύτερη λύση για αυτό είναι η χρήση του GRUB2 που είναι διαθέσιμο από "
+#~ "τη σελίδα σύνοψης στα βήματα της εγκατάστασης."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Αν αποφασίσετε να χρησιμοποιήσετε ένα υπάρχον μενού εκκίνησης τότε θα "
+#~ "πρέπει να θυμηθείτε να ΣΤΑΜΑΤΗΣΕΤΕ στη σελίδα σύνοψης κατά την "
+#~ "εγκατάσταση και να κάνετε κλικ στο κουμπί <guibutton>Διαμόρφωσης</"
+#~ "guibutton> του προγράμματος εκκίνησης, το οποίο θα σας επιτρέψει να "
+#~ "αλλάξετε την τοποθεσία εγκατάστασης του προγράμματος εκκίνησης."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Μην επιλέξετε μια συσκευή π.χ. «sda», διαφορετικά θα αντικαταστήσετε το "
+#~ "υπάρχον σας MBR.  Πρέπει να επιλέξετε την κατάτμηση root που επιλέξατε "
+#~ "κατά τον διαμερισμό νωρίτερα π.χ. sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Δηλαδή, το sda είναι μια συσκευή, και το sda7 είναι μια κατάτμηση."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Μεταβείτε στο tty2 με Ctrl+Alt+F2 και πληκτρολογήστε <literal>df</"
+#~ "literal> για να ελέγξετε που βρίσκεται η κατάτμηση <literal>/</literal> "
+#~ "(root). Με Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Προχωρημένη λειτουργία του προγράμματος εκκίνησης"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Αν έχετε περιορισμένο χώρο στο δίσκο για την κατάτμηση <literal>/</"
+#~ "literal> που περιέχει <literal>/tmp</literal>, κάντε κλικ στο "
+#~ "<guibutton>Για προχωρημένους</guibutton> και επιλέξτε το πλαίσιο για "
+#~ "<guilabel>Καθαρισμό του /tmp σε κάθε εκκίνηση</guilabel>. Αυτό βοηθά στη "
+#~ "διατήρηση κάποιου ελεύθερου χώρου."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -5132,13 +5556,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
index 90a86690..6c57ff2c 100644
--- a/docs/installer/en/setupBootloader.xml
+++ b/docs/installer/en/setupBootloader.xml
@@ -238,7 +238,7 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
         </listitem>
 
         <listitem>
-          <para>P<guilabel>robe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+          <para><guilabel>Probe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
         </listitem>
 
         <listitem>
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index ac3320ab..2abafc9e 100644
--- a/docs/installer/eo.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -164,26 +164,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Uzula kaj superuzula administrado"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -191,12 +180,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -216,7 +205,7 @@ msgstr ""
 "mistajpis la unuan pasvorton dank'al komparo inter ambaŭ."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -226,12 +215,12 @@ msgstr ""
 "karaktroj en pasvorto."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Enigo de uzulo (Enter a user)"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -242,7 +231,7 @@ msgstr ""
 "kaj por io ajn kion la averaĝa uzulo faras perkomputile"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -251,7 +240,7 @@ msgstr ""
 "la uzulan ikonon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -260,7 +249,7 @@ msgstr ""
 "skatolo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -272,7 +261,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -283,7 +272,7 @@ msgstr ""
 "forton de la pasvorto. (Vidu ankaŭ <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -294,57 +283,39 @@ msgstr ""
 "uzulaj pasvortaj teksto-skatoloj."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (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:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s) after reboot."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "If you prefer world readable home directories, you might want to add all "
 "extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
 "during the install. Choose <emphasis>User management</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Sperta uzulo-administrado"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -353,12 +324,12 @@ msgstr ""
 "ebliganta eldoni la konfiguron de la aldonata uzulo."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -369,7 +340,7 @@ msgstr ""
 "gasto devus konservi gravajn dosierojn en USB-ŝlosilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -381,7 +352,7 @@ msgstr ""
 "normalaj uzuloj."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -392,7 +363,7 @@ msgstr ""
 "on, Dash-on kaj Sh-on"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -403,7 +374,7 @@ msgstr ""
 "ĝin malplena se vi ne scias kion fari."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -739,19 +710,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Grafika medio"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
 msgstr "Depende de viaj elektoj ĉi tie, povos aperi aliaj agordaj ekranoj."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -762,16 +733,17 @@ msgstr ""
 "guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -790,23 +762,24 @@ msgstr ""
 "havas malpli da grafikaj uzulaj interfacoj kaj pakaĵoj instalitaj defaŭlte."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Pakaĵaj grupoj"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" width=\"800\" depth=\"600\"></imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -819,22 +792,22 @@ msgstr ""
 "musan montrilon sur ili."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Laborstacio."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Servilo."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafika medio."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -843,11 +816,11 @@ msgstr ""
 "forigi permane pakaĵojn."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 #, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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."
@@ -1285,20 +1258,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Agordi subdiskon per DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1311,7 +1288,7 @@ msgstr ""
 "ne startos."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1322,7 +1299,7 @@ msgstr ""
 "ĝi antaŭ ol komenci."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1331,7 +1308,7 @@ msgstr ""
 "USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1340,7 +1317,7 @@ msgstr ""
 "elektita stor-aparato"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1349,41 +1326,70 @@ msgstr ""
 "elekti dosiersistemon kaj surmetingon, ŝanĝi ĝian grandon aŭ forigi ĝin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Daŭrigu ĝis kiam vi agordos ĉion laŭ via deziro."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. 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:10
+#: 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 "
@@ -1393,7 +1399,7 @@ msgstr ""
 "loko-proponon de DrakX por la instalo de <application>Magejo</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1402,21 +1408,32 @@ msgstr ""
 "enhavo de via konkreta(j)  stor-aparato(j)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Uzu ekzistantajn subdiskojn"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1425,12 +1442,12 @@ msgstr ""
 "kiuj povas esti utiligataj por la instalo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Uzu liberan spacon"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1439,12 +1456,12 @@ msgstr ""
 "nova Mageja instalo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1453,7 +1470,7 @@ msgstr ""
 "povas proponi utiligi ĝin."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1464,7 +1481,7 @@ msgstr ""
 "dosieroj antaŭe!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1481,7 +1498,7 @@ msgstr ""
 "personaj dosieroj."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1490,7 +1507,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1498,25 +1515,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 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:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ĉi tiu elekto utiligos la tutan diskon por Magejo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1526,12 +1553,12 @@ msgstr ""
 "disko kiujn vi ne volas perdi, ne elektu ĉi tion."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Subdiskigo"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1540,55 +1567,55 @@ msgstr ""
 "fiksita(j)  disko(j)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1596,8 +1623,48 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1616,17 +1683,17 @@ msgstr ""
 "settings:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Align to\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1738,27 +1805,24 @@ msgid "Mageia 4"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulon"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
 "\"exitInstall-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1768,7 +1832,7 @@ msgstr ""
 "kaj nun vi povas sekure eltiri la instal-medion kaj reŝarĝi vian komputilon."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1777,7 +1841,7 @@ msgstr ""
 "sistemon lanĉi (se vi havas pli ol unu)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1786,12 +1850,12 @@ msgstr ""
 "kaj ŝarĝita."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Ĝuu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1918,6 +1982,11 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2487,30 +2556,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Diversaj parametroj"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summary.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2522,18 +2577,40 @@ msgstr ""
 "povas kontroli la konfigurojn ĉi tie kaj ŝanĝi ilin se vi volas klakante sur "
 "<guibutton>Konfiguru</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Sistemaj parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Horzono</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2544,12 +2621,12 @@ msgstr ""
 "\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Lando</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2558,33 +2635,33 @@ msgstr ""
 "Vidu <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Startŝarĝilo</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Uzula administrado (User management)</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2593,12 +2670,12 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servoj</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2607,7 +2684,7 @@ msgstr ""
 "(demonoj). Ĉi tiu ilo ebligos vin aktivigi aŭ malaktivigi diversajn taskojn."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2616,22 +2693,22 @@ msgstr ""
 "via komputilo ne funkciu ĝuste."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Aparatar-parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klavaro</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2639,13 +2716,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Muso</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2654,12 +2738,12 @@ msgstr ""
 "mov-globojn, ktp."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Son-karto </guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2667,43 +2751,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafika interfaco</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Retaj parametroj"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Reto</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2716,7 +2801,7 @@ msgstr ""
 "aktivigi la neliberajn deponejojn."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2725,12 +2810,12 @@ msgstr ""
 "ĝi kontrolu ankaŭ tiun ret-interfacon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Prokuraj serviloj</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2740,7 +2825,7 @@ msgstr ""
 "tiu sekcio ebligas vin konfiguri vian komputilon por utiligi prokuran servon."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2749,17 +2834,17 @@ msgstr ""
 "vi devas enigi ĉi tie"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Sekureco"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Sekurec-nivelo </guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2768,17 +2853,17 @@ msgstr ""
 "okazoj la defaŭlta konfiguro estas adekvata por ĝenerala uzo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Fajroŝirmilo (Fajromuro)</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -2787,10 +2872,12 @@ msgstr ""
 "la reto kiuj volas kompromiti aŭ forŝteli ilin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Elektu la servojn kiuj devas havi aliron al via sistemo. Viaj elektoj "
 "dependos de tio por kio vi utiligas la komputilon."
@@ -2801,28 +2888,44 @@ 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."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -2882,29 +2985,29 @@ msgstr ""
 "<guilabel>Sekureco</guilabel> en la Mageja Kontrolilo."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2913,7 +3016,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2921,22 +3024,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2944,116 +3047,88 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr ""
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3061,63 +3136,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3126,49 +3191,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><title>
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "La instal-paŝoj"
+
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3177,12 +3248,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3190,22 +3261,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3215,55 +3286,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3272,19 +3343,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3292,101 +3363,101 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3394,7 +3465,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3418,63 +3489,63 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Elektu vian Landon / Regionon"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3483,7 +3554,7 @@ msgstr ""
 "kaŭzi ke vi ne kapablu utiligi senkablan reton."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3492,7 +3563,7 @@ msgstr ""
 "Landoj</guilabel> kaj elektu vian landon / regionon tie."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3504,21 +3575,20 @@ msgstr ""
 "la unua listo.  Bv. ignori tion, DrakX daŭrigos kun via reala elekto."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Enir-metodo"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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-"
 "metodon (sube en la listo). Enir-metodoj ebligas uzulojn tajpi mult-lingvajn "
@@ -3530,10 +3600,11 @@ msgstr ""
 "se vi aldonis HTTP/FTP-an medion antaŭ la pakaĵa selekto."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Se vi nevole preterpaŝis la enir-metodon dum la instalo, vi povas aliri ĝin "
@@ -3855,319 +3926,371 @@ msgstr ""
 "por konfiguri la butonojn kiuj ne funkcias en muso kun ses aŭ pli butonoj."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Lanĉilaj ĉefaj elektoj"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Lanĉilaj ĉefaj elektoj"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr ""
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Uzi la lanĉilon de Magejo"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Lanĉilaj ĉefaj elektoj"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Uzi ekzistantan lanĉilon"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+msgstr ""
+"La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo "
+"estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj "
+"estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri "
+"ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Se vi preferas malsaman lanĉilan konfiguron al tiu elektita aŭtomate fare de "
-"la instalilo, vi povas ŝanĝi ĝin ĉi tie."
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Eble vi havas jam alian operacian sistemon en via maŝino, tiukaze vi devas "
-"decidi ĉu vi volas aldoni Magejon al via ekzistanta lanĉilo aŭ ebligi al "
-"Magejo krei novan."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "La grafika menuo de Magejo estas bela :)"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Uzi la lanĉilon de Magejo"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
-"Defaŭlte Magejo skribas novan GRUB-lanĉilon en la MBR de via unua fiksita "
-"disko.  Se vi jam havas aliajn operaciajn sistemojn, Magejo provos aldoni "
-"ilin al via nova Mageja lanĉilo."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
-"used."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Uzi ekzistantan lanĉilon"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Servoj</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Se vi decidas uzi ekzistantan lanĉilon tiam vi devos klaki sur la lanĉila "
-"butono <guibutton>Konfiguru</guibutton>, kiu ebligos vin ŝanĝi la instal-"
-"lokon de la lanĉilo."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Ne selektu aparaton kiel \"sda\" aŭ vi anstataŭigos la ekzistantan MBR. Vi "
-"devas selekti la saman radikan subdiskon kiun vi elektis dum la subdiskigo, "
-"ekzemple sda7."
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Klarigcele, sda estas aparato, sda7 subdisko."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Iru al tty2 per la premo de Ctrl+Alt+F2 kaj tajpu <literal>df</literal> por "
-"vidi kie estas via radika subdisko <literal>/</literal>. Ctrl+Alt+F7 venigos "
-"vin ree al la instal-ekrano."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"La ĝusta procezo por aldoni vian Magejan sistemon al ekzistanta lanĉilo "
-"estas preter la celo de tiu ĉi helpilo, tamen en la plimulto el la kazoj "
-"estos necese lanĉi lanĉilan instal-programon kiu devus detekti kaj konfiguri "
-"ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Lanĉila sperta elekto"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Se vi havas tre limigitan spacon en via disko por subdisko <literal>/</"
-"literal> enhavanta samtempe la dosierujon <literal>/tmp</literal>, klaku sur "
-"<guibutton>Progresinta</guibutton> kaj aktivigu la skatolon dirantan "
-"<guilabel>Purigu /tmp dum ĉiuj startadoj</guilabel>. Tio helpos teni iom da "
-"libera spaco."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -4218,22 +4341,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX devus tiam esti kapabla konfiguri la aparato(j)n ĝuste."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr ""
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4241,7 +4365,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4251,7 +4375,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4259,12 +4383,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Progresinta"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4272,7 +4396,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4421,12 +4545,12 @@ msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4434,7 +4558,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4442,7 +4566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4454,14 +4578,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4509,6 +4633,201 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s) after "
+#~ "reboot."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summary.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Se vi preferas malsaman lanĉilan konfiguron al tiu elektita aŭtomate fare "
+#~ "de la instalilo, vi povas ŝanĝi ĝin ĉi tie."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Eble vi havas jam alian operacian sistemon en via maŝino, tiukaze vi "
+#~ "devas decidi ĉu vi volas aldoni Magejon al via ekzistanta lanĉilo aŭ "
+#~ "ebligi al Magejo krei novan."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Defaŭlte Magejo skribas novan GRUB-lanĉilon en la MBR de via unua fiksita "
+#~ "disko.  Se vi jam havas aliajn operaciajn sistemojn, Magejo provos aldoni "
+#~ "ilin al via nova Mageja lanĉilo."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy) and will not be recognised if the default GRUB "
+#~ "bootloader is used."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Se vi decidas uzi ekzistantan lanĉilon tiam vi devos klaki sur la lanĉila "
+#~ "butono <guibutton>Konfiguru</guibutton>, kiu ebligos vin ŝanĝi la instal-"
+#~ "lokon de la lanĉilo."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Ne selektu aparaton kiel \"sda\" aŭ vi anstataŭigos la ekzistantan MBR. "
+#~ "Vi devas selekti la saman radikan subdiskon kiun vi elektis dum la "
+#~ "subdiskigo, ekzemple sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Klarigcele, sda estas aparato, sda7 subdisko."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Iru al tty2 per la premo de Ctrl+Alt+F2 kaj tajpu <literal>df</literal> "
+#~ "por vidi kie estas via radika subdisko <literal>/</literal>. Ctrl+Alt+F7 "
+#~ "venigos vin ree al la instal-ekrano."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Lanĉila sperta elekto"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Se vi havas tre limigitan spacon en via disko por subdisko <literal>/</"
+#~ "literal> enhavanta samtempe la dosierujon <literal>/tmp</literal>, klaku "
+#~ "sur <guibutton>Progresinta</guibutton> kaj aktivigu la skatolon dirantan "
+#~ "<guilabel>Purigu /tmp dum ĉiuj startadoj</guilabel>. Tio helpos teni iom "
+#~ "da libera spaco."
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
@@ -4529,14 +4848,6 @@ msgstr ""
 #~ "\" align=\"center\" width=\"800\" format=\"PNG\" depth=\"600\" xml:id="
 #~ "\"setupBootloader-im1\"></imagedata> </imageobject>"
 
-#, fuzzy
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
-#~ "\"center\"></imagedata> </imageobject>"
-
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
diff --git a/docs/installer/es.po b/docs/installer/es.po
index 960fae60..f0e1a944 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2017-01-13 14:09+0000\n"
 "Last-Translator: Jose Manuel López <joselp@outlook.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -198,26 +198,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Administración de usuarios y del administrador"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -225,12 +214,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -251,7 +240,7 @@ msgstr ""
 "ningún error en la primera contraseña,comparándolas."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -261,12 +250,12 @@ msgstr ""
 "minúsculas), números y otros símbolos."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Introduzca un usuario"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -278,7 +267,7 @@ msgstr ""
 "ordenador."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -287,7 +276,7 @@ msgstr ""
 "del usuario."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -296,7 +285,7 @@ msgstr ""
 "usuario en este recuadro."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -308,7 +297,7 @@ msgstr ""
 "las mayúsculas.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -319,7 +308,7 @@ msgstr ""
 "la fortaleza de la contraseña. (Vea también <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -330,58 +319,39 @@ msgstr ""
 "recuadro anterior."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Todo usuario que se añada en la instalación de Mageia tendrá un directorio "
 "home legible por todos (pero protegido contra escritura)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Sin embargo, cuando use su nueva instalación, todo usuario que añada en "
-"<emphasis>MCC - Sistema - Administrar usuarios del sistema</emphasis> tendrá "
-"un directorio home protegido contra lectura y escritura."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Si no quiere directorios home legibles por todo el mundo, se recomienda "
-"añadir ahora un usuario temporal y añadir los usuarios (reales) tras "
-"reiniciar el ordenador."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Si prefiere directorios legibles por todo el mundo, puede añadir todos los "
 "usuarios necesarios en <emphasis>Configuración - Resumen</emphasis> durante "
 "la instalación. Elija <emphasis>Administrar usuarios</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Administración Avanzada de Usuarios"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -390,12 +360,12 @@ msgstr ""
 "permite editar la configuración del usuario que está añadiendo. "
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -406,7 +376,7 @@ msgstr ""
 "debe de guardar sus archivos importantes en una unidad USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -418,7 +388,7 @@ msgstr ""
 "que los usuarios normales."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -428,7 +398,7 @@ msgstr ""
 "el usuario que está añadiendo. Las opciones son Bash, Dash y Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -439,7 +409,7 @@ msgstr ""
 "salvo que sepa lo que está haciendo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -820,12 +790,12 @@ msgstr ""
 "\">pasos adicionales en modo Live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Selección de escritorio"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -834,7 +804,7 @@ msgstr ""
 "ajustar su elección de manera más precisa."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -845,16 +815,17 @@ msgstr ""
 "<guilabel>Detalles</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"../es/dx2-chooseDesktop.png\" align="
-"\"center\" format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -873,22 +844,23 @@ msgstr ""
 "con una apariencia menos llamativa y menos paquetes instalados por defecto."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Selección de Grupo de Paquetes"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackageGroups."
 "png\" format=\"PNG\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -901,22 +873,22 @@ msgstr ""
 "grupo se muestra más información sobre ellos."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Estación de trabajo."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Servidor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Entorno gráfico."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -925,10 +897,11 @@ msgstr ""
 "eliminar manualmente los paquetes."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Lea en <xref linkend=\"minimal-instal\"></xref> las instrucciones para "
 "realizar una instalación mínima (con o sin X &amp; IceWM)."
@@ -1412,23 +1385,24 @@ msgstr ""
 "selección conservadora. "
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1441,7 +1415,7 @@ msgstr ""
 "lo contrario, su sistema no arrancará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1452,7 +1426,7 @@ msgstr ""
 "en ella antes de comenzar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1461,7 +1435,7 @@ msgstr ""
 "como una unidad USB. Por ejemplo, sda, sdb y sdc si se encuentran tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1470,7 +1444,7 @@ msgstr ""
 "del disco de almacenaje seleccionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1480,44 +1454,79 @@ msgstr ""
 "montaje, cambie el tamaño o elimínela."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continue hasta que ajuste todo a su gusto."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Si está instalando Mageia en un sistema UEFI, compruebe que un ESP "
 "(Partición de Sistema EFI) está presente y correctamente montada en  /boot/"
 "EFI (ver más arriba)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Si está instalando Mageia en un sistema UEFI, compruebe que un ESP "
+"(Partición de Sistema EFI) está presente y correctamente montada en  /boot/"
+"EFI (ver más arriba)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1528,7 +1537,7 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1537,21 +1546,32 @@ msgstr ""
 "contenido de su(s) disco(s)  duro(s)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Usar la partición existente"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1560,12 +1580,12 @@ msgstr ""
 "compatibles con Linux que pueden ser usadas para la instalación."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Usar el espacio libre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1574,12 +1594,12 @@ msgstr ""
 "nueva instalación de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1588,7 +1608,7 @@ msgstr ""
 "puede ofrecer usarlo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1599,7 +1619,7 @@ msgstr ""
 "de seguridad de todos sus archivos importantes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1617,7 +1637,7 @@ msgstr ""
 "de sus archivos personales."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1631,7 +1651,7 @@ msgstr ""
 "imagen siguiente."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1639,25 +1659,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Borrar y usar el disco entero"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Esta opción usará el disco completo para Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1667,12 +1697,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:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Particionamiento  personalizado"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1681,12 +1711,12 @@ msgstr ""
 "en su(s)  disco(s) duro(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Tamaño de las particiones:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1695,7 +1725,7 @@ msgstr ""
 "reglas:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1704,7 +1734,7 @@ msgstr ""
 "partición para /, y no hay una partición separada para /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1712,23 +1742,23 @@ msgstr ""
 "particiones"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "el resto (por lo menos 12/19) se asigna a /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1737,7 +1767,7 @@ msgstr ""
 "creará tres particiones: 50 GB para /, 4 GB para swap y el resto para /home"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1749,8 +1779,48 @@ msgstr ""
 "EFI. La opción \"Personalizado\" es la única que permite verificar si se "
 "hizo correctamente."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1769,17 +1839,17 @@ msgstr ""
 "siguientes configuraciones:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Alinear a\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Espacio libre que precede a (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1891,27 +1961,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Felicitaciones"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"../es/dx2-exitInstall.png\" revision="
 "\"1\" align=\"center\" xml:id=\"exitInstall-im1\" format=\"PNG\" /> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1921,7 +1988,7 @@ msgstr ""
 "ahora es seguro retirar el medio de instalación y reiniciar su ordenador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1930,7 +1997,7 @@ msgstr ""
 "sistemas operativos de su ordenador (si tiene más de uno)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1939,12 +2006,12 @@ msgstr ""
 "Mageia será automáticamente seleccionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "¡Que lo disfrute!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2079,6 +2146,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2743,30 +2815,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resumen de la Configuración"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2777,18 +2835,40 @@ msgstr ""
 "del hardware que ha detectado.  Puede comprobar la configuración aquí y "
 "cambiarla si quiere pulsando <guibutton>Configurar</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Configuraciones del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Huso horario</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2799,12 +2879,12 @@ msgstr ""
 ">"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>País / Región</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2813,33 +2893,33 @@ msgstr ""
 "linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Cargador de arranque</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr "No cambie nada, salvo que sepa configurar Grub y/o Lilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Administración de usuarios</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2848,12 +2928,12 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servicios</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2863,7 +2943,7 @@ msgstr ""
 "le permite activar o desactivar algunos de ellos."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2872,23 +2952,23 @@ msgstr ""
 "equivocación puede hacer que su ordenador no funcione correctamente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Configuraciones de hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teclado</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2896,13 +2976,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Ratón</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2911,12 +2998,12 @@ msgstr ""
 "trackballs, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Tarjeta de sonido</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2927,42 +3014,44 @@ msgstr ""
 "pero ninguno es el que viene por defecto."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfaz gráfica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Configuraciones de redes e Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Red</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2975,7 +3064,7 @@ msgstr ""
 "activados los repositorios non-free."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2984,12 +3073,12 @@ msgstr ""
 "que también la controle."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Servidores proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -3000,7 +3089,7 @@ msgstr ""
 "proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -3009,17 +3098,17 @@ msgstr ""
 "parámetros que debe poner aquí."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Seguridad"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nivel de seguridad</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3029,17 +3118,17 @@ msgstr ""
 "para un uso general."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Cortafuegos</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3049,10 +3138,12 @@ msgstr ""
 "pueden intentar robar o comprometer sus archivos."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Seleccione los servicios a los que quiere tener acceso en su sistema. Su "
 "selección dependerá del uso que haga de su ordenador."
@@ -3065,26 +3156,39 @@ msgstr ""
 "peligroso!"
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Una vez el cargador de arranque se ha instalado, se le pedirá que detenga su "
+"ordenador, extraiga el CD live y reinicie el ordenador. Cuando reinicie, "
+"verá una sucesión de barras de progreso de descargas. Estas indican que los "
+"repositorios de sofware se están descargando (ver administración de "
+"software)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Una vez el cargador de arranque se ha instalado, se le pedirá que detenga su "
 "ordenador, extraiga el CD live y reinicie el ordenador. Cuando reinicie, "
@@ -3092,6 +3196,16 @@ msgstr ""
 "repositorios de sofware se están descargando (ver administración de "
 "software)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3152,17 +3266,17 @@ msgstr ""
 "Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Seleccione y use una ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introducción"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3171,12 +3285,12 @@ msgstr ""
 "que imagen se ajusta a sus necesidades."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Hay dos familias de medios:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3189,7 +3303,7 @@ msgstr ""
 "escritorio quiere instalar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3200,22 +3314,22 @@ msgstr ""
 "instalación es más sencillo, pero tiene menos opciones."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Medio"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definicion"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3226,7 +3340,7 @@ msgstr ""
 "archivo ISO sea copiado."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3235,23 +3349,23 @@ msgstr ""
 "\">aquí</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Medio de instalación clásico."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Caracterśticas comunes."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3259,17 +3373,17 @@ msgstr ""
 "lanzamientos previos."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Medios diferentes para arquitecturas de 32 o 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3278,59 +3392,26 @@ 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:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Se le dará la opción durante la instalación de agregar o no software no "
 "libre."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Ambas arquitecturas están presentes en el mismo medio, la ellección se "
-"realiza automáticamente de acuerdo al CPU detectado."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Utiliza sólo de escritorio Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Sólo algunos lenguajes (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, "
-"uk) PARA REVISAR!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Contiene software no libre"
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Medio Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3340,18 +3421,20 @@ msgstr ""
 "disco rígido."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "El ISO solo contiene un entorno de escritorio (KDE o GNOME)"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3362,63 +3445,57 @@ msgstr ""
 "versiones previas.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Ellos contienen software no libre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Sólo entorno de escritorio KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Sólo idioma Inglés."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "sólo 32 bit."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Todos los idiomas presentes."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Sólo entorno de escritorio GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Todos los idiomas presentes."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Sólo entorno de escritorio KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Medio CD sólo de arranque"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3432,7 +3509,7 @@ msgstr ""
 "Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3442,13 +3519,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Sólo idioma Inglés."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Iniciar la instalación"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3457,12 +3540,13 @@ msgstr ""
 "propietario."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3471,17 +3555,17 @@ msgstr ""
 "aquellos que lo necesiten."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Descargando y verificando medios."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Descargando"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3494,12 +3578,12 @@ msgstr ""
 "demasiado bajo. Si elige http, además puede ver algo como"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3510,22 +3594,22 @@ msgstr ""
 "uso posterior</link>. Entonces aparece esta ventana:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Marque el botón Guardar Archivo."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Verificar integridad del medio descargado"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3541,12 +3625,12 @@ msgstr ""
 "descargar de nuevo."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3555,7 +3639,7 @@ msgstr ""
 "archivo.iso</userinput>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3564,7 +3648,7 @@ msgstr ""
 "archivo.iso</userinput>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3573,17 +3657,17 @@ msgstr ""
 "poco) con el número provisto por Mageia. Ejemplo:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Grabar o volcar el ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3593,12 +3677,12 @@ msgstr ""
 "un medio arrancable."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3612,12 +3696,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">la wiki de Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3626,7 +3710,7 @@ msgstr ""
 "en un USB y usarlas para arrancar e instalar el sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3637,7 +3721,7 @@ msgstr ""
 "capacidad de la partición se reducirá al tamaño de la imagen."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3646,12 +3730,12 @@ msgstr ""
 "dispositivo USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3660,17 +3744,17 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Usted puede probar:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3679,7 +3763,7 @@ msgstr ""
 "la opción \"imagen ISO\";"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3688,12 +3772,12 @@ msgstr ""
 "Disco de Imagenes</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3702,29 +3786,29 @@ msgstr ""
 "una partición del disco si obtiene un identificador de dispositivo erróneo."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Abrir consola"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3733,17 +3817,17 @@ msgstr ""
 "archivos que pueda leerlo)."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3754,7 +3838,7 @@ msgstr ""
 "<emphasis>sd</emphasis> y <emphasis>sdd</emphasis> in este caso:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3796,7 +3880,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3805,19 +3889,19 @@ msgstr ""
 "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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 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:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Donde X=nombre de tu dispositivo ej:/dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3826,37 +3910,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Desconecta tu pendrive USB, esta echo"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Seleccione su país / Región"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3865,7 +3949,7 @@ msgstr ""
 "no pueda usar la conexión inalámbrica."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3874,7 +3958,7 @@ msgstr ""
 "Países</guilabel> y elija su país / región allí."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3887,21 +3971,20 @@ msgstr ""
 "seguirá su elección real."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Método de entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 de <guilabel>Otros Países</guilabel> también puede "
 "seleccionar un método de entrada (al final de la lista). Los métodos de "
@@ -3914,10 +3997,11 @@ msgstr ""
 "instalarse si añadió medios HTTP/FTP antes de la selección de paquetes."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Si durante la instalación olvidó configurar el método de entrada, puede "
@@ -4251,356 +4335,383 @@ msgstr ""
 "más botones."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Para más información acerca de las opciones del kernel en sistemas antiguos "
+"y UEFI, ver <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Opciones principales del cargador de arranque"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Con un sistema BIOS"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Opciones principales del cargador de arranque"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Puede agregar una entrada o modificar la que escogió primero, pulsando el "
-"boton necesario en la ventana <emphasis>Configuración de arranque</emphasis> "
-"y modificando los opciones en la ventana que aparece encima."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Si ha elegido Grub 2 como su gestor de arranque, no se puede utilizar esta "
-"herramienta para editar las entradas en este paso, pulse \"Siguiente\". Hay "
-"que editar manualmente /boot/grub2/custom.cfg o utilizar grub-editor en su "
-"lugar."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Con un sistema UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "Los menús gráficos de Mageia son agradables:"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+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:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Con un sistema UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Unas cosas que se pueden hacer sin peligro son cambiar la etiqueta de una "
-"entrada y marcar una como la predeterminada."
+"Con un sistema UEFI, la interfaz de usuario es un poco diferente ya que no "
+"se puede elegir el cargador de arranque, debido a que solamente Grub2-efi "
+"está disponible."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Puede anadir el número de versión adecuado a una entrada o la puede "
-"renombrar completamente."
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"La entrada predeterminada es la que usará su sistema para arrancar a menos "
-"que seleccione otra."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Editar otras cosas puede dejarlo con un sistema que no arranque. Por favor, "
-"no intente algo sin saber lo que está haciendo."
+"Si Mageia es el primer sistema instalado en su equipo, el instalador ha "
+"creado una ESP (Partición de Sistema Efi), para recibir el gestor de "
+"arranque (Grub2-efi). Si ya existían sistemas operativos UEFI previamente "
+"instalados en su equipo, (Windows 8 por ejemplo), el instalador de Mageia ha "
+"detectado el ESP existente creado por Windows y ha agregado grub2-efi. "
+"Aunque es posible tener varios ESP, solo uno es aconsejado y suficiente sea "
+"cual sea el número de sistemas operativos que tenga."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Con un sistema UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Usando el cargador de arranque de Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"En esta caso, se está usando Grub2-efi y no puede usar esta herramienta para "
-"editar entradas en este paso. Para hacer esto necesita editar a mano <code>/"
-"boot/grub2/custom.cfg</code>. Todo lo que se puede hacer aquí es escoger el "
-"acceso por defecto en el menú desplegable."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Tras un click en el botón <guibutton>Siguiente</guibutton>, otra lista "
-"desplegable permite elegir la resolución de vídeo para Grub2, que es un "
-"cargador de arranque gráfico."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Opciones principales del cargador de arranque"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Usando un cargador de arranque existente"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+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 "
+"consiste en ejecutar el programa de instalación del cargador de arranque que "
+"debería detectarlo y añadirlo automáticamente. Vea la documentación del "
+"sistema operativo en cuestión."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
+msgid ""
+"If you don't want a bootable Mageia, but 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>."
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Si prefiere una configuración distinta de la elegida automáticamente por "
-"elinstalador del cargador de arranque, aquí puede cambiarla."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Puede que tenga otro sistema operativo en su ordenador. En ese caso, "
-"necesita decidir si desea añadir Mageia al cargador de arranque existente o "
-"permitir a Mageia crear uno nuevo."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Los menús gráficos de Mageia son agradables:"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Usando el cargador de arranque de Mageia"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
-"Por defecto, Mageia escribe un nuevo cargador GRUB en el MBR (Master Boot "
-"Record) de su primer disco duro. Si ya tiene otros sistemas operativos, "
-"Mageia intentará añadirlos al nuevo menú de arranque."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia ahora también ofrece GRUB2 como administrador de arranque "
-"opcionalademás del tradicional GRUB y de Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Los sistemas Linux que usan el cargador de arranque GRUB2 actualmente no son "
-"soportados por GRUB  y no se reconocerán si se usa el cargador GRUB por "
-"defecto."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"La mejor solución es usar el cargador de arranque GRUB2 que está disponible "
-"en la página de resumen durante la instación."
+"<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."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Usando un cargador de arranque existente"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Servicios</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Si decide usar un cargador de arranque existente, tendrá que acordarse de "
-"PARAR en la página del resumen durante la instalación y pulsar el botón de "
-"<guibutton>Configuración</guibutton> del Cargador de Arranque, que le "
-"permitirá cambiar el lugar de instalación del cargador de arranque."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"No elija un dispositivo como \"sda\", o sobrescribirá el MBR existente. Debe "
-"de elegir la partición root que eligió durante la fase de particionado, como "
-"por ejemplo sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Para ser claro, sda es un dispositivo, sda7 es una partición."
-
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Vaya a tty2 con Ctrl+Alt+F2 y escriba <literal>df</literal> para comprobar "
-"donde está su partición <literal>/</literal> (root). Ctrl+Alt+F7 le devuelve "
-"al instalador."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"consiste en ejecutar el programa de instalación del cargador de arranque que "
-"debería detectarlo y añadirlo automáticamente. Vea la documentación del "
-"sistema operativo en cuestión."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Opción avanzada del cargador de arranque"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Si tiene el espacio del disco muy limitado para la partición <literal>/</"
-"literal> que contiene <literal>/tmp</literal>, haga click en "
-"<guibutton>Avanzado</guibutton> y marque la casilla para <guilabel>Limpiar /"
-"tmp en cada arranque</guilabel>.  Esto ayuda a mantener algo de espacio "
-"libre."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Con un sistema UEFI, la interfaz de usuario es un poco diferente ya que no "
-"se puede elegir el cargador de arranque, debido a que solamente Grub2-efi "
-"está disponible."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Si Mageia es el primer sistema instalado en su equipo, el instalador ha "
-"creado una ESP (Partición de Sistema Efi), para recibir el gestor de "
-"arranque (Grub2-efi). Si ya existían sistemas operativos UEFI previamente "
-"instalados en su equipo, (Windows 8 por ejemplo), el instalador de Mageia ha "
-"detectado el ESP existente creado por Windows y ha agregado grub2-efi. "
-"Aunque es posible tener varios ESP, solo uno es aconsejado y suficiente sea "
-"cual sea el número de sistemas operativos que tenga."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"No modifique el \"Dispositivo de Arranque\" a menos que sepa realmente qué "
-"está hace."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4652,22 +4763,23 @@ msgstr ""
 "Después DrakX debería de poder configurar el(los) disco(s) correctamente."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Configurar el sonido"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4677,7 +4789,7 @@ msgstr ""
 "para su tarjeta de sonido, que será el dado por defecto si es que hay alguno."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4693,7 +4805,7 @@ msgstr ""
 "pantalla."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4705,12 +4817,12 @@ msgstr ""
 "sobre cómo resolver el problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avanzado"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4721,7 +4833,7 @@ msgstr ""
 "disponibles, o si cree que el instalador escogió el driver equivocado."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4893,12 +5005,12 @@ msgid "Uninstalling Mageia"
 msgstr "Desinstalando Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Guias"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4910,7 +5022,7 @@ msgstr ""
 "operativos."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4922,7 +5034,7 @@ msgstr ""
 "menú para elegir el sistema operativo."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4942,7 +5054,7 @@ msgstr ""
 "<guibutton>Eliminar</guibutton>."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4951,7 +5063,7 @@ msgstr ""
 "NTFS). Se obtendrá una letra de partición."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -5010,3 +5122,304 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Sin embargo, cuando use su nueva instalación, todo usuario que añada en "
+#~ "<emphasis>MCC - Sistema - Administrar usuarios del sistema</emphasis> "
+#~ "tendrá un directorio home protegido contra lectura y escritura."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Si no quiere directorios home legibles por todo el mundo, se recomienda "
+#~ "añadir ahora un usuario temporal y añadir los usuarios (reales) tras "
+#~ "reiniciar el ordenador."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"../es/dx2-chooseDesktop.png\" align="
+#~ "\"center\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Ambas arquitecturas están presentes en el mismo medio, la ellección se "
+#~ "realiza automáticamente de acuerdo al CPU detectado."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Utiliza sólo de escritorio Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Sólo algunos lenguajes (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, "
+#~ "sv, uk) PARA REVISAR!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Contiene software no libre"
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "sólo 32 bit."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Con un sistema BIOS"
+
+#~ 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."
+#~ msgstr ""
+#~ "Puede agregar una entrada o modificar la que escogió primero, pulsando el "
+#~ "boton necesario en la ventana <emphasis>Configuración de arranque</"
+#~ "emphasis> y modificando los opciones en la ventana que aparece encima."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Si ha elegido Grub 2 como su gestor de arranque, no se puede utilizar "
+#~ "esta herramienta para editar las entradas en este paso, pulse \"Siguiente"
+#~ "\". Hay que editar manualmente /boot/grub2/custom.cfg o utilizar grub-"
+#~ "editor en su lugar."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Unas cosas que se pueden hacer sin peligro son cambiar la etiqueta de una "
+#~ "entrada y marcar una como la predeterminada."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Puede anadir el número de versión adecuado a una entrada o la puede "
+#~ "renombrar completamente."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "La entrada predeterminada es la que usará su sistema para arrancar a "
+#~ "menos que seleccione otra."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Editar otras cosas puede dejarlo con un sistema que no arranque. Por "
+#~ "favor, no intente algo sin saber lo que está haciendo."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "En esta caso, se está usando Grub2-efi y no puede usar esta herramienta "
+#~ "para editar entradas en este paso. Para hacer esto necesita editar a mano "
+#~ "<code>/boot/grub2/custom.cfg</code>. Todo lo que se puede hacer aquí es "
+#~ "escoger el acceso por defecto en el menú desplegable."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Tras un click en el botón <guibutton>Siguiente</guibutton>, otra lista "
+#~ "desplegable permite elegir la resolución de vídeo para Grub2, que es un "
+#~ "cargador de arranque gráfico."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Si prefiere una configuración distinta de la elegida automáticamente por "
+#~ "elinstalador del cargador de arranque, aquí puede cambiarla."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Puede que tenga otro sistema operativo en su ordenador. En ese caso, "
+#~ "necesita decidir si desea añadir Mageia al cargador de arranque existente "
+#~ "o permitir a Mageia crear uno nuevo."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Por defecto, Mageia escribe un nuevo cargador GRUB en el MBR (Master Boot "
+#~ "Record) de su primer disco duro. Si ya tiene otros sistemas operativos, "
+#~ "Mageia intentará añadirlos al nuevo menú de arranque."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia ahora también ofrece GRUB2 como administrador de arranque "
+#~ "opcionalademás del tradicional GRUB y de Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Los sistemas Linux que usan el cargador de arranque GRUB2 actualmente no "
+#~ "son soportados por GRUB  y no se reconocerán si se usa el cargador GRUB "
+#~ "por defecto."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "La mejor solución es usar el cargador de arranque GRUB2 que está "
+#~ "disponible en la página de resumen durante la instación."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Si decide usar un cargador de arranque existente, tendrá que acordarse de "
+#~ "PARAR en la página del resumen durante la instalación y pulsar el botón "
+#~ "de <guibutton>Configuración</guibutton> del Cargador de Arranque, que le "
+#~ "permitirá cambiar el lugar de instalación del cargador de arranque."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "No elija un dispositivo como \"sda\", o sobrescribirá el MBR existente. "
+#~ "Debe de elegir la partición root que eligió durante la fase de "
+#~ "particionado, como por ejemplo sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Para ser claro, sda es un dispositivo, sda7 es una partición."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Vaya a tty2 con Ctrl+Alt+F2 y escriba <literal>df</literal> para "
+#~ "comprobar donde está su partición <literal>/</literal> (root). Ctrl+Alt"
+#~ "+F7 le devuelve al instalador."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Opción avanzada del cargador de arranque"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Si tiene el espacio del disco muy limitado para la partición <literal>/</"
+#~ "literal> que contiene <literal>/tmp</literal>, haga click en "
+#~ "<guibutton>Avanzado</guibutton> y marque la casilla para "
+#~ "<guilabel>Limpiar /tmp en cada arranque</guilabel>.  Esto ayuda a "
+#~ "mantener algo de espacio libre."
diff --git a/docs/installer/et.po b/docs/installer/et.po
index ae1dc976..5fce7685 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-25 06:19+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -105,9 +105,9 @@ msgstr "et"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 
-#.  papoteur 2013-04-13  - created
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#.  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
 msgid ""
@@ -179,26 +179,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Kasutajate ja administraatori haldamine"
 
-#.  Started by marja,using Led43's text, on 2012 03 27
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing
-#.        about guest account there, is the box you can tick or untick to enable or
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -206,12 +195,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Administraatori (root) parooli määramine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -232,7 +221,7 @@ msgstr ""
 "kirjutatud, neid kahte omavahel võrreldes."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -242,12 +231,12 @@ msgstr ""
 "väiketähti kui ka numbreid ja muid märke."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Kasutaja lisamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -259,7 +248,7 @@ msgstr ""
 "arvutis teeb"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -268,7 +257,7 @@ msgstr ""
 "ikooni."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -276,7 +265,7 @@ msgstr ""
 "<guilabel>Pärisnimi</guilabel>: siin saab kirja panna kasutaja tegeliku nime."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -287,7 +276,7 @@ msgstr ""
 "<emphasis>Kasutajatunnus on tõstutundlik.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -298,7 +287,7 @@ msgstr ""
 "\"givePassword\"/>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -309,41 +298,22 @@ msgstr ""
 "ülal asuvasse kasti."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Kõigi Mageia paigaldamise ajal lisatud kasutajate kodukataloog on kõigile "
 "näha (\"loetav\"), kuid siiski kirjutuskaitstud."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Kui aga uue paigalduse järel lisada kasutaja tööriistaga <emphasis>Mageia "
-"juhtimiskeskus - Süsteem - Kasutajate haldamine</emphasis>, on nende "
-"kasutajate kodukataloog kaitstud nii kirjutamise kui ka lugemise eest."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Kui te ei soovi, et kodukataloog oleks kellelegi näha ehk loetav, on "
-"soovitatav praegu lisada ainult ajutine kasutaja ja tegelikud kasutajad "
-"alles pärast taaskäivitamist."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Kui aga teil pole midagi selle vastu, et kodukataloogid on kõigile näha, "
 "võite lisada kõik vajalikud kasutajad juba paigaldamise ajal "
@@ -351,17 +321,17 @@ msgstr ""
 "haldamine</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Põhjalikum kasutajate haldamine"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -370,12 +340,12 @@ msgstr ""
 "muuta lisatava kasutaja mõningaid seadistusi."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -386,7 +356,7 @@ msgstr ""
 "failid peaks külaline salvestama USB-pulgale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -398,7 +368,7 @@ msgstr ""
 "kasutajaga võrreldes palju piiratumad."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -408,7 +378,7 @@ msgstr ""
 "kasutab eelmisel ekraanil lisatud kasutaja. Valikuteks on Bash, Dash ja Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -419,7 +389,7 @@ msgstr ""
 "siia midagi kirjutage."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -434,17 +404,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Haakepunktide valimine"
 
-#.  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
+#.  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
+#.        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
+#.  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 ""
@@ -793,12 +763,12 @@ msgstr ""
 "\"testing\">Live-režiimi lisasammude</link> tõttu."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Töölaua valimine"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -807,7 +777,7 @@ msgstr ""
 "saab valikut täpsustada."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -818,16 +788,17 @@ msgstr ""
 "<guilabel>Üksikasjad</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png\" "
-"format=\"PNG\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -845,22 +816,23 @@ msgstr ""
 "väiksem kui eelmainitud, pakkudes vähem tilu-lilu ja ka vähemat arvu pakette."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Paketigruppide valimine"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -872,22 +844,22 @@ msgstr ""
 "kohta pakutakse ka rohkem teavet, kui viite hiirekursori nime kohale."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Tööjaam."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Graafiline keskkond."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -896,10 +868,11 @@ msgstr ""
 "eemaldada."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref>."
@@ -946,8 +919,8 @@ msgstr ""
 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
+#.  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
 msgid ""
@@ -1001,8 +974,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Ajavööndi seadistamine"
 
-#.  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 ""
@@ -1380,23 +1353,24 @@ msgstr ""
 "tasub valides olla pigem konservatiivne."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1409,7 +1383,7 @@ msgstr ""
 "ole süsteemi võimalik üldse laadida."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1420,7 +1394,7 @@ msgstr ""
 "alustamist näha, mida partitsioon sisaldab."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1430,7 +1404,7 @@ msgstr ""
 "olema kolm salvestusseadet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1439,7 +1413,7 @@ msgstr ""
 "<guibutton>Kustuta kõik</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1449,44 +1423,79 @@ msgstr ""
 "või ka kustutada."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI "
 "süsteemipartitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/"
 "EFI (vt eespool)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Kui paigaldate Mageia UEFI süsteemi, kontrollige, kas ESP (EFI "
+"süsteemipartitsioon) on ikka olemas ja korrektselt haagitud asukohta /boot/"
+"EFI (vt eespool)."
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1497,7 +1506,7 @@ msgstr ""
 "paigaldamiseks."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1506,21 +1515,32 @@ msgstr ""
 "sisust."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Olemasolevate partitsioonide kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1529,12 +1549,12 @@ msgstr ""
 "neid võib kasutada paigaldamiseks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Vaba ruumi kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1543,12 +1563,12 @@ msgstr ""
 "uuele Mageia paigaldusele."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1557,7 +1577,7 @@ msgstr ""
 "paigaldusprogramm seda kasutada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1568,7 +1588,7 @@ msgstr ""
 "kõigist olulistest failidest varukoopia!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1585,7 +1605,7 @@ msgstr ""
 "äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1599,7 +1619,7 @@ msgstr ""
 "Seda näitab allolev pilt."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1607,25 +1627,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Kogu ketta tühjendamine ja kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1635,12 +1665,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:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Ketta jagamine oma tahtmist mööda"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1649,12 +1679,12 @@ msgstr ""
 "või -ketastel paigaldatakse."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitsioonide suurus:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1662,7 +1692,7 @@ msgstr ""
 "Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1671,30 +1701,30 @@ msgstr ""
 "ning /home jaoks eraldi partitsiooni ei looda."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 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:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "ülejäänu (vähemalt 12/19) eraldatakse /home jaoks"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1703,7 +1733,7 @@ msgstr ""
 "partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1715,8 +1745,48 @@ msgstr ""
 "EFI. Valik \"Kohandatud\" on ainuke, mis lubab kontrollida, kas seda on "
 "õigesti tehtud."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1735,17 +1805,17 @@ msgstr ""
 "gparted."
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Align to\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1859,26 +1929,23 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Õnnitleme!"
 
-#.  Started by marja on 2012 03 29
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#.  marja - 2012-04-24 added screenshot and text
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1889,7 +1956,7 @@ msgstr ""
 "taaskäivitada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1898,7 +1965,7 @@ msgstr ""
 "operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1907,12 +1974,12 @@ msgstr ""
 "automaatselt teie uus Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Tundke rõõmu ja nautige!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1925,10 +1992,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Vormindamine"
 
-#.  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
 msgid ""
@@ -2046,6 +2113,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2456,10 +2528,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Uuendused"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
+#.  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
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2544,9 +2616,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Andmekandjate valik (mittevaba tarkvara)"
 
-#.  papoteur 2013-04-11  - created
+#.  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-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
@@ -2696,30 +2768,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Seadistuste kokkuvõte"
 
-#.  Started by marja on 2012 03 31
-#.  NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#.       the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-summary.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"summary-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2730,18 +2788,40 @@ msgstr ""
 "valikutele ja tuvastatud riistvarale. Siin saab neid seadistusi üle vaadata "
 "ja vajaduse korral muuta, klõpsates <guibutton>Seadista</guibutton>."
 
+#. type: Content of: <section><note><para>
+#: en/misc-params.xml:21
+msgid ""
+"As a general rule, default settings are recommended and you can keep them "
+"with 3 exceptions:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Süsteemi parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Ajavöönd</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2751,12 +2831,12 @@ msgstr ""
 "muuta. Vt ka <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Riik / Piirkond</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2765,35 +2845,35 @@ msgstr ""
 "Vt <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Alglaadur</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr ""
 "Kui Te just väga täpselt ei tea, kuidas Grubi ja/või LiLot seadistada, ei "
 "tasu siin midagi muuta."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Kasutajate haldamine</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2802,12 +2882,12 @@ msgstr ""
 "home</literal> kataloogi."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Teenused</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2816,7 +2896,7 @@ msgstr ""
 "(deemonid). See tööriist võimaldab teatavaid ülesandeid lubada või keelata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2825,22 +2905,22 @@ msgstr ""
 "arvuti enam korralikult töötada."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Riistvara parameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klaviatuur</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2848,13 +2928,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Hiir</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2863,12 +2950,12 @@ msgstr ""
 "puuteplaate jms."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Helikaart</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2879,41 +2966,43 @@ msgstr ""
 "draiverit, aga ükski neist ei ole vaikimisi draiver."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Graafiline kasutajaliides</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-summaryBottom.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"summaryBottom-im1\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Võrgu- ja internetiparameetrid"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Võrk</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2926,7 +3015,7 @@ msgstr ""
 "mittevaba tarkvara hoidlate kasutamist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2935,12 +3024,12 @@ msgstr ""
 "kaarti jälgitaks."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Puhverserverid</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2950,7 +3039,7 @@ msgstr ""
 "panna arvuti kasutama puhverservereid."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2959,17 +3048,17 @@ msgstr ""
 "süsteemiadministraatoriga."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Turvalisus"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Turbetase</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2978,17 +3067,17 @@ msgstr ""
 "kasutamiseks kõlbama vaikimisi seadistused (valik Standardne)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Tulemüür</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -2997,10 +3086,12 @@ msgstr ""
 "röövloomade vahel, kes üritavad neid varastada või rikkuda."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Valige teenused, millel lubate oma süsteemile ligi pääseda. Valik sõltub "
 "mõistagi sellest, milleks Te oma arvutit kasutada soovite."
@@ -3012,32 +3103,54 @@ msgstr ""
 "Pange tähele, et kõige lubamine (st tulemüür puudub) võib olla väga ohtlik."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Taaskäivitamine"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD "
+"eemaldada ja arvuti taaskäivitada. Taaskäivitamise järel näete allalaadimise "
+"edenemisribasid. Need annavad märku, et parajasti laaditakse alla "
+"tarkvaraallikaid (vt täpsemalt tarkvarahalduse osast)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD "
 "eemaldada ja arvuti taaskäivitada. Taaskäivitamise järel näete allalaadimise "
 "edenemisribasid. Need annavad märku, et parajasti laaditakse alla "
 "tarkvaraallikaid (vt täpsemalt tarkvarahalduse osast)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3063,8 +3176,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Turbetase"
 
-#.  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:19
 msgid ""
@@ -3099,17 +3212,17 @@ msgstr ""
 "Mageia juhtimiskeskuse sektsioonis <guilabel>Turvalisus</guilabel>."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "ISO-tõmmise valimine ja kasutamine"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Sissejuhatus"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3118,12 +3231,12 @@ msgstr ""
 "tõmmist, mis vastab teie vajadustele."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Andmekandjaid on kaht tüüpi:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3137,7 +3250,7 @@ msgstr ""
 "hakata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3148,22 +3261,22 @@ msgstr ""
 "Paigaldamine on lihtsam, aga ka valikuid on vähem."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr "Üksikasjadest kõneldakse järgmistes osades."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Andmekandjad"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Määratlus"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3174,7 +3287,7 @@ msgstr ""
 "seadet, millele ISO-tõmmis on kopeeritud."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3183,40 +3296,40 @@ msgstr ""
 "\">siit</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klassikalised paigaldusandmekandjad"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Ühised omadused"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr "Kasutavad traditsioonilist paigaldusprogrammi drakx"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 "Saab teha nii puhta paigalduse kui ka uuendada varasematelt väljalasetelt"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3225,57 +3338,25 @@ msgstr ""
 "riistvara tuvastamise tööriist"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Paigaldamise käigus lastakse valida, kas kasutada mittevaba tarkvara või "
 "mitte"
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "Kahearhitektuurne (dualarch) DVD"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Ühel ja samal andmekandjal on nii 32- kui ka 64-bitine tarkvara; valik "
-"tehakse automaatselt vastavalt tuvastatud protsessorile"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Ainult Xfce töökeskkond"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Ainult mõned keeled (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk)"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Sisaldab mittevaba tarkvara"
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live-andmekandjad"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3284,18 +3365,20 @@ msgstr ""
 "paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "ISO sisaldab ainult üht töökeskkonda (KDE või GNOME)"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "Eri andmekandjad 32- ja 64-bitisele arhitektuurile"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3305,63 +3388,57 @@ msgstr ""
 "mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Sisaldavad mittevaba tarkvara"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "KDE LiveCD"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "KDE LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Ainult KDE töökeskkond"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Ainult inglise keeles"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Ainult 32-bitine"
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Sisaldab kõiki keeli"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "GNOME LiveCD"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "GNOME LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Ainult GNOME töökeskkond"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "KDE LiveDVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Sisaldab kõiki keeli"
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "GNOME LiveDVD"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Ainult KDE töökeskkond"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "CD-d ainult alglaadimiseks"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3374,7 +3451,7 @@ msgstr ""
 "muul kohalikul kettal, kohalikus võrgus või internetis."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3384,13 +3461,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Ainult inglise keeles"
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Paigaldamise käivitamine"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3399,12 +3482,13 @@ msgstr ""
 "kasutama"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3413,17 +3497,17 @@ msgstr ""
 "seda vajavad"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Andmekandja allalaadimine ja kontrollimine"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Allalaadimine"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3436,12 +3520,12 @@ msgstr ""
 "liiga väike. HTTP valimise korral peaks pilt olema umbes selline:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3452,22 +3536,22 @@ msgstr ""
 "\">edasiseks kasutamiseks</link>. Seejärel ilmub selline aken:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Märkige raadionupp Salvestama."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Allalaaditud andmekandja terviklikkuse kontrollimine"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3483,12 +3567,12 @@ msgstr ""
 "laadida."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3497,7 +3581,7 @@ msgstr ""
 "iso/asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3506,7 +3590,7 @@ msgstr ""
 "tõmmisefail.iso/asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3515,17 +3599,17 @@ msgstr ""
 "allalaadimissaidil näidatuga:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "ISO kirjutamine"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3534,12 +3618,12 @@ msgstr ""
 "ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3552,12 +3636,12 @@ msgstr ""
 "wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wikist</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "ISO kirjutamine USB-pulgale"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3566,7 +3650,7 @@ msgstr ""
 "pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3577,7 +3661,7 @@ msgstr ""
 "suurusele."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3585,12 +3669,12 @@ msgstr ""
 "Algse mahu taastamiseks tuleb USB-pulk uuesti partitsioneerida ja vormindada."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr "Graafilise tööriista kasutamine Mageias"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3600,17 +3684,17 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr "Graafilise tööriista kasutamine Windowsis"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Võite proovida järgmisi programme:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3619,7 +3703,7 @@ msgstr ""
 "valikuga \"ISO image\";"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3628,12 +3712,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3642,17 +3726,17 @@ msgstr ""
 "võib ketta partitsiooni sootuks üle kirjutada."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Avage konsool"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3661,12 +3745,12 @@ msgstr ""
 "unustage kriipsukest lõpus)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3675,17 +3759,17 @@ msgstr ""
 "rakendust või failihaldurit, mis seda lugeda võiks)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3696,26 +3780,21 @@ msgstr ""
 "<emphasis>sdd</emphasis>:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3725,21 +3804,16 @@ msgid ""
 msgstr ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3748,7 +3822,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3757,7 +3831,7 @@ msgstr ""
 "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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3766,12 +3840,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "kus X on teie seadme nimi, nt: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3780,37 +3854,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Eemaldage USB-pulk, kõik on valmis"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Riigi / piirkonna valimine"
 
-#.  2012-12-25 marja - moved this section out of misc-params
-#.  2013-05-05 marja - added screenshot
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3819,7 +3893,7 @@ msgstr ""
 "riigi määramisel võib juhtuda, et te ei saagi juhtmeta sidet kasutada."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3828,7 +3902,7 @@ msgstr ""
 "guilabel> ja valige oma riik / piirkond sealt."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3841,21 +3915,20 @@ msgstr ""
 "arvestab teie tegeliku valikuga."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Sisestusmeetod"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "(nimekirjast allpool). See võimaldab kasutajal sisestada keerukate "
@@ -3867,10 +3940,11 @@ msgstr ""
 "neid saab paigaldada, kui lisada enne paketivalikut HTTP või FTP andmekandja."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Kui jätsite paigaldamise ajal sisestusmeetodi valimata, saab seda teha "
@@ -4162,10 +4236,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Hiire valimine"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  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
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4201,368 +4275,407 @@ msgstr ""
 "et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Alglaadimismenüü kirje lisamine või muutmine"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis leiab "
+"meie Wiki-lehelt <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Alglaaduri põhiseadistused"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "BIOS-e süsteemiga"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Alglaaduri seadistamine asjatundjatele"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Kirje saab lisada või valitut muuta, kui klõpsata <emphasis>alglaaduri "
-"seadistamise</emphasis> ekraanil vajalikule nupule ja sooritada muutused "
-"selle kohale ilmuvas ekraanis."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "UEFI süsteemiga"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Kui olete valinud alglaaduriks <code>Grub 2</code>, ei saa te selle "
-"tööriistaga sel sammul kirjeid muuta, nii et klõpsake 'Edasi'. Teil tuleb "
-"käsitsi muuta faili <code>/boot/grub2/custom.cfg</code> või kasutada "
-"tööriista <code>grub-customizer</code>."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+"Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et teate, "
+"mida teete."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "UEFI süsteemiga"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Mõningaid asju võib muuta vähese riskiga, näiteks kirje nimi ja märge "
-"kastikeses, millega see muudetakse vaikimisi kirjeks."
+"UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa "
+"valida alglaadurit, kuna saadaval on ainult Grub2-efi."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Kirje nimele võib lisada versiooninumbri, aga nime võib ka täielikult muuta."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Vaikimisi kirje on see, mille süsteem laadib, kui jätate alglaadimise ajal "
-"kasutamata võimaluse midagi valida."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Teiste parameetrite muutmine võib kaasa tuua süsteemi, mida enam ei saagi "
-"laadida. Sestap ärge muutke siin midagi, mille muutmise vajalikkuses te "
-"täiesti kindel ei ole."
+"Kui Mageia on esimene süsteem, mis teie arvutisse paigaldatakse, loob "
+"paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi) "
+"tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonisüsteeme "
+"(näiteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP "
+"ja lisab sellele Grub2-efi. ESP-sid võib küll põhimõtteliselt olla ka mitu, "
+"aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui "
+"palju on arvutis operatsioonisüsteeme."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "UEFI süsteemiga"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Mageia alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Sel juhul on alglaaduriks valitud Grub2-efi ning te ei saa selle tööriistaga "
-"sel sammul kirjeid muuta. Teil tuleb käsitsi muuta faili <code>/boot/grub2/"
-"custom.cfg</code> või kasutada tööriista <code>grub-customizer</code>. "
-"Ainuke asi, mida siin teha saab, on valida rippmenüüst vaikimisi kirje."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Klõpsu järel nupule <guibutton>Edasi</guibutton> laseb järgmine rippmenüü "
-"valida Grub2 ekraanilahutuse (kuna see on graafiline alglaadur)."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Alglaaduri põhiseadistused"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Olemasoleva alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+"Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile, "
+"väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase "
+"alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle "
+"automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi "
+"dokumentatsiooni."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Kui eelistate teistsuguseid alglaaduri seadistusi kui need, mille valis "
-"paigaldusprogramm automaatselt, saab siin neid muuta."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Teie masinas võib näiteks olla juba mõni operatsioonisüsteem, millisel juhul "
-"tuleb teil otsustada, kas lisada Mageia oma senisele alglaadurile või lubada "
-"Mageial luua uus."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Mageia graafiline menüü näeb kena välja :)"
-
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Mageia alglaaduri kasutamine"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Vaikimisi kirjutab Mageia uue GRUBi alglaaduri teie esimese kõvaketta MBR "
-"(Master Boot Record)  sektsiooni. Kui teil on juba paigaldatud teisi "
-"operatsioonisüsteeme, üritab Mageia lisada need uude Mageia "
-"alglaadimismenüüsse."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Mageia pakub nüüd lisaks vanemale GRUBile ja LiLole võimalust kasutada ka "
-"uuemat alglaadurit GRUB2."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei toeta "
-"ega tunne neid ära, kui kasutada vaikimisi GRUBi alglaadurit."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+#, fuzzy
+msgid "Options"
+msgstr "Kerneli võtmed"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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."
 msgstr ""
-"Sel juhul on parim lahendus kasutada GRUB2 alglaadurit, mille saab valida "
-"paigaldamise ajal kokkuvõtteleheküljel."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Olemasoleva alglaaduri kasutamine"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Kui otsustate kasutada olemasolevat alglaadurit, peate meeles pidama, et "
-"teeksite paigaldamise ajal kokkuvõtteleheküljel peatuse ning klõpsaksite "
-"alglaaduri juures nupule <guibutton>Seadista</guibutton>, mis võimaldab "
-"muuta alglaaduri paigaldamise asukohta."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Ärge valige seadet, nt \"sda\", sest nii kirjutate üle olemasoleva MBR "
-"sektsiooni. Peate valima juurpartitsiooni, mille valisite varasemal "
-"partitsioneerimisetapil, nt sda7."
+"<guilabel>Parool (uuesti)</guilabel>: siia tuleb kirjutada teist korda "
+"kasutaja parool ning DrakX kontrollib, kas see on ikka sama, mis kirjutati "
+"ülal asuvasse kasti."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Et asi selge oleks: sda on seade, sda7 aga partitsioon."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Teenused</guilabel>"
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Minge klahvikombinatsiooniga Ctrl+Alt+F2 tekstiterminali tty2 ja kirjutage "
-"<literal>df</literal>, et teada saada, milline on teie juurpartitsioon "
-"(<literal>/</literal>). Ctrl+Alt+F7 viib teid tagasi paigaldusprogrammi "
-"ekraanile."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Täpne protseduur, kuidas lisada Mageia süsteem olemasolevale alglaadurile, "
-"väljub käesoleva abiteksti raamest, kuid enamasti tähendab see asjakohase "
-"alglaaduri paigaldamise programmi käivitamist, mis tuvastab ja lisab selle "
-"automaatselt. Uurige selle kohta lähemalt vastava operatsioonisüsteemi "
-"dokumentatsiooni."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Alglaaduri täpsemad valikud"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Kui teie juurpartitsioonil <literal>/</literal> on väga vähe ruumi ja selle "
-"peal asub ka <literal>/tmp</literal>, klõpsake <guibutton>Muud valikud</"
-"guibutton> ja märkige ära kastike <guilabel>/tmp puhastatakse igal "
-"käivitumisel</guilabel>. See aitab ruumi mõnevõrra kokku hoida."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"UEFI süsteemi korral on kasutajaliides pisut teistsugune, sest te ei saa "
-"valida alglaadurit, kuna saadaval on ainult Grub2-efi."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Kui Mageia on esimene süsteem, mis teie arvutisse paigaldatakse, loob "
-"paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi) "
-"tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonisüsteeme "
-"(näiteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP "
-"ja lisab sellele Grub2-efi. ESP-sid võib küll põhimõtteliselt olla ka mitu, "
-"aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui "
-"palju on arvutis operatsioonisüsteeme."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et teate, "
-"mida teete."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
 msgid "Setup SCSI"
 msgstr "SCSI seadistamine"
 
-#.  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
+#.  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
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4598,22 +4711,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Heli seadistamine"
 
-#.  Started by marja on 2013-12-07
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4623,7 +4737,7 @@ msgstr ""
 "helikaardile ja millest saab vaikimisi draiver."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4638,7 +4752,7 @@ msgstr ""
 "asuvale ikoonile <guilabel>Heli seadistamine</guilabel>."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4650,12 +4764,12 @@ msgstr ""
 "saada."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Muud valikud"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4666,7 +4780,7 @@ msgstr ""
 "draiverit ning te arvate, et paigaldusprogramm on valinud neist vale."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4679,12 +4793,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Kõvaketta vormindamise kinnitamine"
 
-#.  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
+#.     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
 msgid ""
@@ -4838,12 +4952,12 @@ msgid "Uninstalling Mageia"
 msgstr "Mageia eemaldamine"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Õpetus"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4855,7 +4969,7 @@ msgstr ""
 "korral ka endale täielikult selja keerata."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4867,7 +4981,7 @@ msgstr ""
 "operatsioonisüsteemi valida."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4886,7 +5000,7 @@ msgstr ""
 "<guibutton>Delete</guibutton>. Ruum vabanebki."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4895,7 +5009,7 @@ msgstr ""
 "või NTFS-vormingusse). Uuele partitsioonile antakse oma täht."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4957,6 +5071,308 @@ msgstr ""
 "lasta."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Kui aga uue paigalduse järel lisada kasutaja tööriistaga <emphasis>Mageia "
+#~ "juhtimiskeskus - Süsteem - Kasutajate haldamine</emphasis>, on nende "
+#~ "kasutajate kodukataloog kaitstud nii kirjutamise kui ka lugemise eest."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Kui te ei soovi, et kodukataloog oleks kellelegi näha ehk loetav, on "
+#~ "soovitatav praegu lisada ainult ajutine kasutaja ja tegelikud kasutajad "
+#~ "alles pärast taaskäivitamist."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-chooseDesktop.png"
+#~ "\" format=\"PNG\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-summary.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"summary-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-summaryBottom.png"
+#~ "\" format=\"PNG\" revision=\"1\" xml:id=\"summaryBottom-im1\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "Kahearhitektuurne (dualarch) DVD"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Ühel ja samal andmekandjal on nii 32- kui ka 64-bitine tarkvara; valik "
+#~ "tehakse automaatselt vastavalt tuvastatud protsessorile"
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Ainult Xfce töökeskkond"
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Ainult mõned keeled (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, "
+#~ "uk)"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Sisaldab mittevaba tarkvara"
+
+#~ msgid "Live CD KDE"
+#~ msgstr "KDE LiveCD"
+
+#~ msgid "32 bit only."
+#~ msgstr "Ainult 32-bitine"
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "GNOME LiveCD"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "BIOS-e süsteemiga"
+
+#~ 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."
+#~ msgstr ""
+#~ "Kirje saab lisada või valitut muuta, kui klõpsata <emphasis>alglaaduri "
+#~ "seadistamise</emphasis> ekraanil vajalikule nupule ja sooritada muutused "
+#~ "selle kohale ilmuvas ekraanis."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Kui olete valinud alglaaduriks <code>Grub 2</code>, ei saa te selle "
+#~ "tööriistaga sel sammul kirjeid muuta, nii et klõpsake 'Edasi'. Teil tuleb "
+#~ "käsitsi muuta faili <code>/boot/grub2/custom.cfg</code> või kasutada "
+#~ "tööriista <code>grub-customizer</code>."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Mõningaid asju võib muuta vähese riskiga, näiteks kirje nimi ja märge "
+#~ "kastikeses, millega see muudetakse vaikimisi kirjeks."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Kirje nimele võib lisada versiooninumbri, aga nime võib ka täielikult "
+#~ "muuta."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Vaikimisi kirje on see, mille süsteem laadib, kui jätate alglaadimise "
+#~ "ajal kasutamata võimaluse midagi valida."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Teiste parameetrite muutmine võib kaasa tuua süsteemi, mida enam ei saagi "
+#~ "laadida. Sestap ärge muutke siin midagi, mille muutmise vajalikkuses te "
+#~ "täiesti kindel ei ole."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Sel juhul on alglaaduriks valitud Grub2-efi ning te ei saa selle "
+#~ "tööriistaga sel sammul kirjeid muuta. Teil tuleb käsitsi muuta faili "
+#~ "<code>/boot/grub2/custom.cfg</code> või kasutada tööriista <code>grub-"
+#~ "customizer</code>. Ainuke asi, mida siin teha saab, on valida rippmenüüst "
+#~ "vaikimisi kirje."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Klõpsu järel nupule <guibutton>Edasi</guibutton> laseb järgmine rippmenüü "
+#~ "valida Grub2 ekraanilahutuse (kuna see on graafiline alglaadur)."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Kui eelistate teistsuguseid alglaaduri seadistusi kui need, mille valis "
+#~ "paigaldusprogramm automaatselt, saab siin neid muuta."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Teie masinas võib näiteks olla juba mõni operatsioonisüsteem, millisel "
+#~ "juhul tuleb teil otsustada, kas lisada Mageia oma senisele alglaadurile "
+#~ "või lubada Mageial luua uus."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Vaikimisi kirjutab Mageia uue GRUBi alglaaduri teie esimese kõvaketta MBR "
+#~ "(Master Boot Record)  sektsiooni. Kui teil on juba paigaldatud teisi "
+#~ "operatsioonisüsteeme, üritab Mageia lisada need uude Mageia "
+#~ "alglaadimismenüüsse."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia pakub nüüd lisaks vanemale GRUBile ja LiLole võimalust kasutada ka "
+#~ "uuemat alglaadurit GRUB2."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei "
+#~ "toeta ega tunne neid ära, kui kasutada vaikimisi GRUBi alglaadurit."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Sel juhul on parim lahendus kasutada GRUB2 alglaadurit, mille saab valida "
+#~ "paigaldamise ajal kokkuvõtteleheküljel."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Kui otsustate kasutada olemasolevat alglaadurit, peate meeles pidama, et "
+#~ "teeksite paigaldamise ajal kokkuvõtteleheküljel peatuse ning klõpsaksite "
+#~ "alglaaduri juures nupule <guibutton>Seadista</guibutton>, mis võimaldab "
+#~ "muuta alglaaduri paigaldamise asukohta."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Ärge valige seadet, nt \"sda\", sest nii kirjutate üle olemasoleva MBR "
+#~ "sektsiooni. Peate valima juurpartitsiooni, mille valisite varasemal "
+#~ "partitsioneerimisetapil, nt sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Et asi selge oleks: sda on seade, sda7 aga partitsioon."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Minge klahvikombinatsiooniga Ctrl+Alt+F2 tekstiterminali tty2 ja "
+#~ "kirjutage <literal>df</literal>, et teada saada, milline on teie "
+#~ "juurpartitsioon (<literal>/</literal>). Ctrl+Alt+F7 viib teid tagasi "
+#~ "paigaldusprogrammi ekraanile."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Alglaaduri täpsemad valikud"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Kui teie juurpartitsioonil <literal>/</literal> on väga vähe ruumi ja "
+#~ "selle peal asub ka <literal>/tmp</literal>, klõpsake <guibutton>Muud "
+#~ "valikud</guibutton> ja märkige ära kastike <guilabel>/tmp puhastatakse "
+#~ "igal käivitumisel</guilabel>. See aitab ruumi mõnevõrra kokku hoida."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -4975,13 +5391,6 @@ msgstr ""
 #~ "imageobject>"
 
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-
-#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
@@ -5062,9 +5471,6 @@ msgstr ""
 #~ "<imageobject> <imagedata align=\"center\" fileref=\"../dx-help.png\" "
 #~ "format=\"PNG\" revision=\"1\" xml:id=\"installer-im2\"/> </imageobject>"
 
-#~ msgid "Kernel Options"
-#~ msgstr "Kerneli võtmed"
-
 #~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
@@ -5115,9 +5521,6 @@ msgstr ""
 #~ "because that page has the filename the help button in the '''Graphic Card "
 #~ "and Monitor Configuration''' screen in installer links to."
 
-#~ msgid "Bootloader expert use"
-#~ msgstr "Alglaaduri seadistamine asjatundjatele"
-
 #~ msgid ""
 #~ "If you haven't done so yet, please read <xref linkend=\"setupBootloader\"/"
 #~ "> first."
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index 0d2bc8cb..392802a1 100644
--- a/docs/installer/eu.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-10-04 13:35+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -183,26 +183,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -210,12 +199,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ezarri administratzaile (root) pasahitza:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -236,7 +225,7 @@ msgstr ""
 "egiaztatzeko."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -245,12 +234,12 @@ msgstr ""
 "minuskulak), zenbakiak eta bestelako karaktereak nahastea pasahitz batean."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Sartu erabiltzaile bat"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -262,7 +251,7 @@ msgstr ""
 "ordenagailuarekin edozer egiteko."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -271,7 +260,7 @@ msgstr ""
 "erabiltzaile ikonoa aldatu egingo da."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -280,7 +269,7 @@ msgstr ""
 "ezazu testu-kutxa honetan."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -292,7 +281,7 @@ msgstr ""
 "minuskulei sentibera da.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -304,7 +293,7 @@ msgstr ""
 "\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -315,58 +304,39 @@ msgstr ""
 "pasahitzeko testuko kutxetako bakoitzean pasahitz bera duzula."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Mageia instalatzen duzun bitartean gehitutako edozein erabiltzaile, mundu "
 "bat irakurgarri izango du (baina idazteko babesarekin) home direktorioan."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Hala ere, instalatzen ari zaren bitartean, edozein erabiltzaile "
-"<emphasis>MCC - Sistema -Erabiltzaile Kudeatzaile sistema</emphasis> gehitu "
-"home direktorioa duena zein irakurtzeko eta idazteko babestuta izango dena."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Ez baduzu nahi home direktorioa edonork irakurgarri izan dezan, aldi "
-"baterako erabiltzaile bat soilik gehitu orain eta berrabiarazi ondoren "
-"benetako(ak) gehitzea komeni da."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Mundu guztiak irakur ditzakeen direktorioak nahigao badituzu, instalazioan "
 "zehar <emphasis>Ezarpen - Laburpen</emphasis> beharrezko erabiltzaile "
 "guztiak gehi ditzakezu. Aukeratu <emphasis>Erabiltzaileak kudeatu</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Erabiltzailearen Kudeaketa Aurreratua"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -375,12 +345,12 @@ msgstr ""
 "duen erabiltzailearentzat editatzea baimentzen dion pantaila eskaintzen zaio."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -391,7 +361,7 @@ msgstr ""
 "Gonbidatuak bere fitxategi garrantzitsuak USB disko baten gorde behar ditu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -403,7 +373,7 @@ msgstr ""
 "murritzagoak izaten dira."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -414,7 +384,7 @@ msgstr ""
 "a aldatzeko aukera, aukerak dira Bash, Dash eta Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -425,7 +395,7 @@ msgstr ""
 "utzi ezazu ez badakizu zer egiten ari zaren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -807,12 +777,12 @@ msgstr ""
 "moduan urrats osagarriekin</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Idaztegi hautaketa"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -821,7 +791,7 @@ msgstr ""
 "aukera doitzeko."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -832,16 +802,17 @@ msgstr ""
 "daiteke."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -860,22 +831,23 @@ msgstr ""
 "instalatutako pakete gutxiagorekin, aurreko beste biak baino arinagoa da."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Pakete-taldearen hautapena"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -888,22 +860,22 @@ msgstr ""
 "talde bakoitzaren gainetik sagua pasatzean."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Lanpostua."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Zerbitzaria."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Ingurumen Grafikoa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -912,10 +884,11 @@ msgstr ""
 "edo kentzeko paketeak."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref> instalazio minimo bat "
 "egiteko argibideak (X &amp; IceWM -ekin edo gabe)."
@@ -1397,23 +1370,24 @@ msgstr ""
 "kontserbadorea izan behar da."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Pertsonalizatua disko partizioak DiskDrake-rekin"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1426,7 +1400,7 @@ msgstr ""
 "sistema ez izango da abiarazi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1437,7 +1411,7 @@ msgstr ""
 "haietan hasi baino lehen dagoena arren ikusi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1447,7 +1421,7 @@ msgstr ""
 "badira."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1456,7 +1430,7 @@ msgstr ""
 "partizio guztiak garbitzeko"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1465,44 +1439,79 @@ msgstr ""
 "aukeratu fitxategi sistema eta muntatze puntua, tamainaz aldatu edo garbitu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Jarraitu dena zure nahiei egokitu arte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "ageia 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:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"ageia 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><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1513,7 +1522,7 @@ msgstr ""
 "duen tokia ikusi."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1522,21 +1531,32 @@ msgstr ""
 "disko gogor(rren) diseinu eta edukien arabera."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Lehendik dauden Partizioak"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1545,12 +1565,12 @@ msgstr ""
 "egin dira eta instalazioa erabili ahal izango du."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Erabili Espazio Hutsa"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1559,12 +1579,12 @@ msgstr ""
 "erabiliko da zure Mageia instalazio berriarentzat."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1573,7 +1593,7 @@ msgstr ""
 "instalatzaileak, erabili ahal izateko eskainiko dizu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1584,7 +1604,7 @@ msgstr ""
 "garrantzitsuen babeskopia egin behar duzu!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1601,7 +1621,7 @@ msgstr ""
 "gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1614,7 +1634,7 @@ msgstr ""
 "partizioen arteko hutsunea arrastatuz. Ikusi beheko pantaila."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1622,25 +1642,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Ezabatu eta erabili disko osoa."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Aukera honek disko osoa erabiliko du Mageia-rantzat."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1650,12 +1680,12 @@ msgstr ""
 "informazioa baduzu,, ez ezazu aukera hau erabili."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Pertsonalizatua"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1664,12 +1694,12 @@ msgstr ""
 "gogorrean."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partizioak dimentsionatzen:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1678,7 +1708,7 @@ msgstr ""
 "arabera:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1687,7 +1717,7 @@ msgstr ""
 "ez da sortuko /, ez baitago /home partizioa bereizita ."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1695,24 +1725,24 @@ msgstr ""
 "partizio sortuko dira"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "gainerakoa (gutxienez 12/19) da / home-ra esleitzen da"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1722,7 +1752,7 @@ msgstr ""
 "home-entzako."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1734,8 +1764,48 @@ msgstr ""
 "eta /boot/EFI-n muntatu. \"Pertsonalizatua\" aukerak arrakastaz bete dela "
 "frogatzen du."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1753,17 +1823,17 @@ msgstr ""
 "gero, eta hurrengo konfigurazioak erabil ditzala:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"lerrokatu\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Aurreko espazio librea (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin."
@@ -1874,27 +1944,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Zorionak"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1905,7 +1972,7 @@ msgstr ""
 "berrabiaraztea."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1914,7 +1981,7 @@ msgstr ""
 "eragileen artean aukera dezakezu (bat baino gehiago izanez gero)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1923,12 +1990,12 @@ msgstr ""
 "automatikoki hautatu eta hasiko da."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Gozatu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2062,6 +2129,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2720,30 +2792,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Hainbat parametroen laburpena"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2754,18 +2812,40 @@ msgstr ""
 "hardwarearen arabera. Ezarpenak egiaztatu ahal izango dituzu hemen eta "
 "<guibutton>Ezarri</guibutton> sakatu aldatu nahi baduzu."
 
+#. type: Content of: <section><note><para>
+#: en/misc-params.xml:21
+msgid ""
+"As a general rule, default settings are recommended and you can keep them "
+"with 3 exceptions:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Sistema parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Denbora-Eremua</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2776,12 +2856,12 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Herrialde/Eskualde</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2790,33 +2870,33 @@ msgstr ""
 "<xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Abio kargatzailea</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr "Ezer ez aldatu, Grub edo/ta Lilo konfiguratzeaz jakin ezean"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Erabiltzaile kudeaketa</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2825,12 +2905,12 @@ msgstr ""
 "literal> direktorioa izango du."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Zerbitzuak</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2840,7 +2920,7 @@ msgstr ""
 "desgaitzeko aukera ematen dizu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2849,22 +2929,22 @@ msgstr ""
 "ordenagailuak gaizki funtzionatzea eragin dezake."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Hardware parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teklatua</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2872,13 +2952,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Sagua</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2887,12 +2974,12 @@ msgstr ""
 "trackballs, etab "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Soinu txartela</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2903,43 +2990,45 @@ msgstr ""
 "baina bat ere ez dator lehenetsita."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfaze grafikoa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Sare eta Internet parametroak"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Sarea</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2951,7 +3040,7 @@ msgstr ""
 "Kontrol Gunean</application>, non-free biltegiak gaituta eduki ondoren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2960,12 +3049,12 @@ msgstr ""
 "ezartzen, ikusteko ere."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxiak</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2976,7 +3065,7 @@ msgstr ""
 "ordenagailuak erabiltzeko ezarpenak jartzeko baimentzen dizu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2985,17 +3074,17 @@ msgstr ""
 "sartu beharreko parametroak"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Segurtasuna"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Segurtasun Maila</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3005,17 +3094,17 @@ msgstr ""
 "orokorrerako."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Suebakia</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3025,10 +3114,12 @@ msgstr ""
 "arriskuan jarri dezaketenen artean hesi bat jartzea da."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Aukera itzazu zure sisteman sartu nahi dituzun zerbitzuak. Zure aukeraketa "
 "zure ordenagailuan egiten duzun erabileraren mende egongo da."
@@ -3041,32 +3132,54 @@ msgstr ""
 "daitekeela."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Berrabiarazi"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Behin kargatzailea instalatuta, eskatuko dizu zure ordenagailua gelditzeko, "
+"zuzeneko CD-a kendu eta ordenagailua berrabiarazteko. Abiaraztean, deskarga "
+"aurrerapen barra segida bat ikusiko duzu. Hornek adierazten dun software "
+"baliabideetatik deskargatzen ari dela (ikus Software kudeaketa)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Behin kargatzailea instalatuta, eskatuko dizu zure ordenagailua gelditzeko, "
 "zuzeneko CD-a kendu eta ordenagailua berrabiarazteko. Abiaraztean, deskarga "
 "aurrerapen barra segida bat ikusiko duzu. Hornek adierazten dun software "
 "baliabideetatik deskargatzen ari dela (ikus Software kudeaketa)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3126,17 +3239,17 @@ msgstr ""
 "Kontrol Gunean segurtasun ezarpenak aldatzea."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Aukeratu eta erabili ISOa"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Sarrera"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3145,12 +3258,12 @@ msgstr ""
 "aukeratzen lagunduko dizu."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Bi media famili daude:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3163,7 +3276,7 @@ msgstr ""
 "Idazmahaiko Ingurunea aukeratzeko."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3174,22 +3287,22 @@ msgstr ""
 "da, baina aukera txikiagoak lortuko dituzu."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr "Xehetasunak ematen dira hurrengo ataletan."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Baliabidea"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definizioa"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3200,7 +3313,7 @@ msgstr ""
 "kopiatzen den edozein fisiko sostengatzen du."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3209,24 +3322,24 @@ msgstr ""
 "\">hemen</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Instalazioa Klasiko baliabidea"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Ezaugarri komunak"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3234,17 +3347,17 @@ msgstr ""
 "batetatik."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Baliabide ezberdinak 32 edo 64 biteko arkitekturentzat."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3253,56 +3366,23 @@ msgstr ""
 "Sistema, Memoria Testa, Hardware hautemate tresna."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 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><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "arkitektura bikoitzeko DVDa"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Arkitektura biak baliabide berean agertzen dira, aukera automatikoki egiten "
-"da atzemandako CPU-aren arabera."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Xfce mahaigaina soilik erabiltzen du."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Hizkuntza guztiak ez daude eskuragarri. (be, bg, ca, de, en, es, fr, it, mk, "
-"pl, pt, ru, sv, uk) EGIAZTAPENAREN ZAIN!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Software ez librea dauka."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live baliabidea"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3311,18 +3391,20 @@ msgstr ""
 "HDD-an instalatzeko erabil daiteke."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "ISO bakoitzak mahaigain ingurune bakarra (KDE edo GNOME) dauka."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "32 edo 64 biteko arkitektura media ezberdinak."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3333,63 +3415,57 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Software ez librea dute."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "KDE-ren Live CDa"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "KDE-ren Live DVD-a"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "KDE mahaigaineko ingurunea soilik."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Ingelera hizkuntza soilik"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "32 bit soilik."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Hizkuntza guztiak presente daude."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "GNOME-ren Live CD-a"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "GNOME-ren Live DVD-a"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "GNOME mahaigaineko ingurunea soilik."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "KDE-ren Live DVD-a"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Hizkuntza guztiak presente daude."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "GNOME-ren Live DVD-a"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "KDE mahaigaineko ingurunea soilik."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Abioko CD baliabidea soilik"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3403,7 +3479,7 @@ msgstr ""
 "Interneten."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3413,13 +3489,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Ingelera hizkuntza soilik"
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Instalaketa abiarazi"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3428,12 +3510,13 @@ msgstr ""
 "dutenentzat."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3442,17 +3525,17 @@ msgstr ""
 "dauzka."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Media Deskargatu eta Egiaztatzen"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Deskargatzen"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3466,12 +3549,12 @@ msgstr ""
 "ahal izango duzu"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3482,22 +3565,22 @@ msgstr ""
 "erabiltzeko</link>. Ondoren leiho hau agertuko da:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Egiaztatu Fitxategia Gorde botoia."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Deskargatutako baliabide osotasunaren egiaztapena"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3513,12 +3596,12 @@ msgstr ""
 "ondorioztatzen du. "
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3527,7 +3610,7 @@ msgstr ""
 "image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3536,7 +3619,7 @@ msgstr ""
 "the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3545,17 +3628,17 @@ msgstr ""
 "zenbakiarekin (pixka bat itxaron beharko duzu). Adibidea:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Grabatu edo irauli ISOa"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3565,12 +3648,12 @@ msgstr ""
 "baliabide bat egitea da."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr "ISOa CD/DVDan grabatzen"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3584,12 +3667,12 @@ msgstr ""
 "\">Mageia wikia</link>n."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "Irauli ISOa USB baten"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3599,7 +3682,7 @@ msgstr ""
 "instalatzeko."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3610,7 +3693,7 @@ msgstr ""
 "ahalmena irudiaren tamainara murriztuko da."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3619,12 +3702,12 @@ msgstr ""
 "duzu USB makila."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3634,17 +3717,17 @@ msgstr ""
 "tresna grafiko bat erabil dezakezu"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Zu saiatuko zinateke:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3653,7 +3736,7 @@ msgstr ""
 "irudia\" aukera erabiliz;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3662,12 +3745,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3676,17 +3759,17 @@ msgstr ""
 "okerreko identifikatzailea lortzeko arriskua dago."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Kontsola bat ireki"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3694,12 +3777,12 @@ msgstr ""
 "Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3708,17 +3791,17 @@ msgstr ""
 "fitxategi kudeatzaile ez ireki  hori eskuratu eta irakurri, ezin)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3729,7 +3812,7 @@ msgstr ""
 "<emphasis>sdd</emphasis> honetan kasu:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3771,7 +3854,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3780,7 +3863,7 @@ msgstr ""
 "dev/sdb</code> goiko irudian, 8GB USB-makila."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3789,12 +3872,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Non X=zure dispositiboaren izena adibidez: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3803,37 +3886,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Deskonektatu zure USB, eginda dago"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Aukeratu zure Herrialdea / Eskualdea"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3842,7 +3925,7 @@ msgstr ""
 "ezartzen baduzu, hari gabeko konexioa ezingo duzu erabili."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3851,7 +3934,7 @@ msgstr ""
 "guilabel> eta aukeratu zure herrialde / eskualdea han."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3864,21 +3947,20 @@ msgstr ""
 "zure benetako aukera jarraituko du."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Sarrera metodoa"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "lehenik (zerrendaren amaieran) ere. Sarrera-metodoek erabiltzaileei "
@@ -3892,10 +3974,11 @@ msgstr ""
 "daitezke."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Ahaztu duzu instalazioan zehar sarrera metodoa konfiguratzea, zure sistema "
@@ -4229,351 +4312,379 @@ msgstr ""
 "konfiguratzen."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Gegitu edo Aldatu Abio Menuko Sarrera"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Kernel ondare eta UEFI sistemtako aukerei buruzko informazio gehiago "
+"lortzeko, ikus:<link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Abio kargatzailearen aukera nagusiak"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Bios sistemarekin"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Abio kargatzailearen aukera nagusiak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Sarrera lehen aukera gehitu edo alda dezakezu, beharrezko botoia sakatuz "
-"<emphasis>Abioko Ezarpen</emphasis>etan eta goian agertzen den leihoan "
-"aukerak aldatzen."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"<code>Grub 2</code> zure abioko kargatzaile bezala aukeratu baduzu,  tresna "
-"hau ezin duzu erabili sarrerak aldatzeko urrats honetan, sakatu 'Hurrengoa'. "
-"<code>/boot/grub2/custom.cfg</code> eskuz editatu edo ordez <code>grub-"
-"customizer</code> erabili behar duzu."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "UEFI sistemarekin"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "The mageia grafiko menu politak ditu:"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr "Ez aldatu \"Abio Gailua\" zer egiten duzun benetan jakin gabe."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "UEFI sistemarekin"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Segurtasunez egin daitezkeen gauza batzuk sarrera bati etiketa aldatzea eta "
-"lehenetsi gisa markatzea."
+"UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak dira, "
+"ezin duzu abiarazlea aukeratu Grub2-efi soilik dagoelako eskuragarri"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Bertsio zenbaki egokia, edo izenez erabat sarrerari gehitu diezaiokezu."
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Lehenetsitako sarrera da sistemak zuk abioan zehar ez baduzu aukera egiten "
-"kargatzen duena."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Beste gauza batzuk aldatzeak zure sistema ez abiaraztea egin dezake. Mesedez "
-"ez egin ezer ere ez, zertan ari zaren jakin gabe."
+"Mageia zure ordenagailuan instalatutako lehen sistema bada, instalatzaileai "
+"ESP (EFI sistema partizioa) sortuko du (Grub2-EFI) kargatzaileak jasotzeko. "
+"Zure ordenagailuan UEFI sistema eragile bat bazegoen aldez aurretik  "
+"(Windows 8 adibidez), Mageia instalatzaileak detektatuko ditu dauden Windows "
+"sortutako ESP eta grub2-EFI-ra gehituko ditu. Hainbat ESP izatea posiblea "
+"izan arren, soilik bat izatea aholkatzen da eta aski dituzun sistema "
+"eragileetako kopurua edozein izanik ere."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "UEFI sistemarekin"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Mageia abio kargatzailea erabiliz"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Kasu honetan Grub2-EFI erabiltzen ari zara, eta ezin duzu tresna hau erabili "
-"sarrerak aldatu egiteko urrats honetan. Horretarako eskuz editatu <code>/"
-"boot/grub2/custom.cfg</code> edo erabili <code>grub-customizer</code> ordez. "
-"Hemen egin dezakezun guztia, goitibeherako zerrendako sarrera lehenetsia "
-"aukeratzea da."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-" <guibutton>Hurrengoa</guibutton> botoia klikatu ondoren, beste "
-"goitibeherako zerrendan bideoaren bereizmena hautatzea uzten du Grub2-"
-"rentzat zein abio kudeatzaike grafiko bat da."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Abio kargatzailearen aukera nagusiak"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Existitzen den abio kargatzaile bat erabiliz"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+msgstr ""
+"Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura "
+"zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio "
+"kargatzaile instalazioak antzeman eta gehitu beharko luke. Ikusi kasuko "
+"sistema eragilearen dokumentazioa."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
+msgid ""
+"If you don't want a bootable Mageia, but 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>."
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Instalatzaileak automatikoki aukeratutako abio kargatzaile ezarpen "
-"ezberdinak nahiago badituzu, hemen alda ditzakezu."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Dagoeneko beste sistema eragile bat baduzu zure makinan, eta kasu horretan "
-"Mageia zure abio kargatzailera gehitu, edo Mageiari baimendu berri bat "
-"sortzea erabaki behar duzu."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "The mageia grafiko menu politak ditu:"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Mageia abio kargatzailea erabiliz"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
-"Berez, Mageia GRUB (Ondare) kargatzaile berria zure disko gogorreko MBR "
-"(Master Boot Record)-an idazten du lehenengoz. Sistema eragile bat baino "
-"gehiago baduzu, Mageia saiatuko da abio menu berrira gehitzen."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia gaur egun GRUB2 eskaintzen du GRUB ondarea eta Lilo gain aukerako "
-"abioko kargatzailea gisa."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Linux sistemek Grub2 abioko kargatzailea erabiltzerakoan ez daude onartuta "
-"GRUB (ondarea)gaitik eta ez du aitortzen lehenetsitako GRUB kargatzailea "
-"erabiltzen badu."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Instalazioan orrialdean zehar laburpena eskuragarri duen GRUB2 abio "
-"kargatzailea hemen erabiltzea da konponbiderik onena."
+"<guilabel>Pasahitza (berriz)</guilabel>: Erabiltzaile-pasahitza berridatziko "
+"duzu kutxa honetan eta drakx-ak begiratuko du testua, erabiltzailearen "
+"pasahitzeko testuko kutxetako bakoitzean pasahitz bera duzula."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Existitzen den abio kargatzaile bat erabiliz"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Zerbitzuak</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Existitzen den abio kargatzaile bat erabili nahi baduzu, instalazioan zehar "
-"gogoratu beharko duzu laburpen orrian GELDITZEA eta Abio Kargatzailearen "
-"<guibutton>Ezarpen</guibutton> botoia sakatzea, abio kargatzailearen "
-"instalazio tokia aldatzen utziko dizu."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Ez ezazu aukeratu \"sda\" bezalako gailu bat, edo MBR existentea "
-"gainidatziko du. Partizio fasean zehar aukeratutako root partizioa aukeratu "
-"behar duzu, adibidez sda7 bezala."
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Argi izan, sda gailu bat da, sda7 gailuaren partizio bat da."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"tty2-ra joan Ctrl+Alt+F2 sakatus eta idatzi <literal>df</literal> zure "
-"<literal>/</literal> (root) partizioa non dagoen egiaztatzeko. Ctrl+Alt+F7 "
-"instalatzailera itzuliarazten dizu."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Zure Mageia sistema erabilea existitzen den abiarazlera gehitzeko prozedura "
-"zehatza eskuliburu honen esparrutik kanpo dago, baina normalean abio "
-"kargatzaile instalazioak antzeman eta gehitu beharko luke. Ikusi kasuko "
-"sistema eragilearen dokumentazioa."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Abioko kargatzailearen aukera aurreratuak"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"<literal>/tmp</literal> duen <literal>/</literal> partizioarentzat toki "
-"gutxi baldin baduzu, klikatu <guibutton>Aurreratua</guibutton> eta "
-"<guilabel>/tmp abio bakoitzean garbitu</guilabel> laukia marka ezazu. Honek "
-"toki libre apur bat mantentzen laguntzen du."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak dira, "
-"ezin duzu abiarazlea aukeratu Grub2-efi soilik dagoelako eskuragarri"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Mageia zure ordenagailuan instalatutako lehen sistema bada, instalatzaileai "
-"ESP (EFI sistema partizioa) sortuko du (Grub2-EFI) kargatzaileak jasotzeko. "
-"Zure ordenagailuan UEFI sistema eragile bat bazegoen aldez aurretik  "
-"(Windows 8 adibidez), Mageia instalatzaileak detektatuko ditu dauden Windows "
-"sortutako ESP eta grub2-EFI-ra gehituko ditu. Hainbat ESP izatea posiblea "
-"izan arren, soilik bat izatea aholkatzen da eta aski dituzun sistema "
-"eragileetako kopurua edozein izanik ere."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "Ez aldatu \"Abio Gailua\" zer egiten duzun benetan jakin gabe."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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
@@ -4624,22 +4735,23 @@ msgstr ""
 "Orduan DrakX kontrolatzile zuzena konfiguratzeko gai izan beharko litzateke."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Soinu Konfiguraketa"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4649,7 +4761,7 @@ msgstr ""
 "da, eta hau kontrolatzaile lehenetsia izango da lehenetsitako bat baduzu."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4664,7 +4776,7 @@ msgstr ""
 "pantailaren goiko eskuineko izkinan."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4675,12 +4787,12 @@ msgstr ""
 "guibutton>n arazoa nola konpondu buruzko aholku lagungarria aurkitzeko."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Aurreratua"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4692,7 +4804,7 @@ msgstr ""
 "duela uste baduzu."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4863,12 +4975,12 @@ msgid "Uninstalling Mageia"
 msgstr "Mageia desinstalatzen"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Jarraibideak"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4879,7 +4991,7 @@ msgstr ""
 "ematen dizu ezabatzeko. Hau ez da egia sistema eragile guztietan."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4891,7 +5003,7 @@ msgstr ""
 "eragilea aukeratzeko."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4910,7 +5022,7 @@ msgstr ""
 "eta hautatu <guibutton>Ezabatu</guibutton>. Espazioa libratuko da."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4919,7 +5031,7 @@ msgstr ""
 "edo NTFS)  formatua eman. Partizioa letra bat jasoko du."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4978,3 +5090,304 @@ msgstr ""
 "Hurrengo pausoa disko gogorrean fitxategiak kopiatzea da. Honek minutu "
 "batzuk hartzen ditu. Bukaeran, pantaila huts bat daukazu aldi baterako, "
 "normala da."
+
+#~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Hala ere, instalatzen ari zaren bitartean, edozein erabiltzaile "
+#~ "<emphasis>MCC - Sistema -Erabiltzaile Kudeatzaile sistema</emphasis> "
+#~ "gehitu home direktorioa duena zein irakurtzeko eta idazteko babestuta "
+#~ "izango dena."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Ez baduzu nahi home direktorioa edonork irakurgarri izan dezan, aldi "
+#~ "baterako erabiltzaile bat soilik gehitu orain eta berrabiarazi ondoren "
+#~ "benetako(ak) gehitzea komeni da."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "arkitektura bikoitzeko DVDa"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Arkitektura biak baliabide berean agertzen dira, aukera automatikoki "
+#~ "egiten da atzemandako CPU-aren arabera."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Xfce mahaigaina soilik erabiltzen du."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Hizkuntza guztiak ez daude eskuragarri. (be, bg, ca, de, en, es, fr, it, "
+#~ "mk, pl, pt, ru, sv, uk) EGIAZTAPENAREN ZAIN!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Software ez librea dauka."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "KDE-ren Live CDa"
+
+#~ msgid "32 bit only."
+#~ msgstr "32 bit soilik."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "GNOME-ren Live CD-a"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Bios sistemarekin"
+
+#~ 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."
+#~ msgstr ""
+#~ "Sarrera lehen aukera gehitu edo alda dezakezu, beharrezko botoia sakatuz "
+#~ "<emphasis>Abioko Ezarpen</emphasis>etan eta goian agertzen den leihoan "
+#~ "aukerak aldatzen."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "<code>Grub 2</code> zure abioko kargatzaile bezala aukeratu baduzu,  "
+#~ "tresna hau ezin duzu erabili sarrerak aldatzeko urrats honetan, sakatu "
+#~ "'Hurrengoa'. <code>/boot/grub2/custom.cfg</code> eskuz editatu edo ordez "
+#~ "<code>grub-customizer</code> erabili behar duzu."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Segurtasunez egin daitezkeen gauza batzuk sarrera bati etiketa aldatzea "
+#~ "eta lehenetsi gisa markatzea."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Bertsio zenbaki egokia, edo izenez erabat sarrerari gehitu diezaiokezu."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Lehenetsitako sarrera da sistemak zuk abioan zehar ez baduzu aukera "
+#~ "egiten kargatzen duena."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Beste gauza batzuk aldatzeak zure sistema ez abiaraztea egin dezake. "
+#~ "Mesedez ez egin ezer ere ez, zertan ari zaren jakin gabe."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Kasu honetan Grub2-EFI erabiltzen ari zara, eta ezin duzu tresna hau "
+#~ "erabili sarrerak aldatu egiteko urrats honetan. Horretarako eskuz editatu "
+#~ "<code>/boot/grub2/custom.cfg</code> edo erabili <code>grub-customizer</"
+#~ "code> ordez. Hemen egin dezakezun guztia, goitibeherako zerrendako "
+#~ "sarrera lehenetsia aukeratzea da."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ " <guibutton>Hurrengoa</guibutton> botoia klikatu ondoren, beste "
+#~ "goitibeherako zerrendan bideoaren bereizmena hautatzea uzten du Grub2-"
+#~ "rentzat zein abio kudeatzaike grafiko bat da."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Instalatzaileak automatikoki aukeratutako abio kargatzaile ezarpen "
+#~ "ezberdinak nahiago badituzu, hemen alda ditzakezu."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Dagoeneko beste sistema eragile bat baduzu zure makinan, eta kasu "
+#~ "horretan Mageia zure abio kargatzailera gehitu, edo Mageiari baimendu "
+#~ "berri bat sortzea erabaki behar duzu."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Berez, Mageia GRUB (Ondare) kargatzaile berria zure disko gogorreko MBR "
+#~ "(Master Boot Record)-an idazten du lehenengoz. Sistema eragile bat baino "
+#~ "gehiago baduzu, Mageia saiatuko da abio menu berrira gehitzen."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia gaur egun GRUB2 eskaintzen du GRUB ondarea eta Lilo gain aukerako "
+#~ "abioko kargatzailea gisa."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linux sistemek Grub2 abioko kargatzailea erabiltzerakoan ez daude "
+#~ "onartuta GRUB (ondarea)gaitik eta ez du aitortzen lehenetsitako GRUB "
+#~ "kargatzailea erabiltzen badu."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Instalazioan orrialdean zehar laburpena eskuragarri duen GRUB2 abio "
+#~ "kargatzailea hemen erabiltzea da konponbiderik onena."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Existitzen den abio kargatzaile bat erabili nahi baduzu, instalazioan "
+#~ "zehar gogoratu beharko duzu laburpen orrian GELDITZEA eta Abio "
+#~ "Kargatzailearen <guibutton>Ezarpen</guibutton> botoia sakatzea, abio "
+#~ "kargatzailearen instalazio tokia aldatzen utziko dizu."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Ez ezazu aukeratu \"sda\" bezalako gailu bat, edo MBR existentea "
+#~ "gainidatziko du. Partizio fasean zehar aukeratutako root partizioa "
+#~ "aukeratu behar duzu, adibidez sda7 bezala."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Argi izan, sda gailu bat da, sda7 gailuaren partizio bat da."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "tty2-ra joan Ctrl+Alt+F2 sakatus eta idatzi <literal>df</literal> zure "
+#~ "<literal>/</literal> (root) partizioa non dagoen egiaztatzeko. Ctrl+Alt"
+#~ "+F7 instalatzailera itzuliarazten dizu."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Abioko kargatzailearen aukera aurreratuak"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "<literal>/tmp</literal> duen <literal>/</literal> partizioarentzat toki "
+#~ "gutxi baldin baduzu, klikatu <guibutton>Aurreratua</guibutton> eta "
+#~ "<guilabel>/tmp abio bakoitzean garbitu</guilabel> laukia marka ezazu. "
+#~ "Honek toki libre apur bat mantentzen laguntzen du."
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 79723a84..bbe86a1a 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:40+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -196,26 +196,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestion de l'Utilisateur et du Superutilisateur"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -223,12 +212,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -249,7 +238,7 @@ msgstr ""
 "fait une erreur de saisie."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -259,12 +248,12 @@ msgstr ""
 "autres caractères."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Indiquer un utilisateur"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -276,7 +265,7 @@ msgstr ""
 "habituellement réalisées par un utilisateur ordinaire avec son PC."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -285,7 +274,7 @@ msgstr ""
 "l'icône de l'utilisateur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -294,7 +283,7 @@ msgstr ""
 "l'utilisateur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -305,7 +294,7 @@ msgstr ""
 "<emphasis>L'identifiant de connexion est sensible à la casse.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -316,7 +305,7 @@ msgstr ""
 "mot de passe (voir également <xref linkend=\"givePassword\"/>)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -327,60 +316,41 @@ msgstr ""
 "dans les deux champs."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Tout utilisateur ajouté lors de l'installation de Mageia aura un répertoire "
 "personnel (dans /home) qui sera accessible en lecture par quiconque, mais "
 "protégé en écriture."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Cependant, tout nouvel utilisateur ajouté par l'intermédiaire du Centre de "
-"Contrôle de Mageia (CCM) aura un répertoire protégé en écriture et en "
-"lecture pour les autres utilisateurs."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Si vous ne désirez pas que le répertoire personnel soit visible par tout le "
-"monde, nous vous conseillons d'ajouter un utilisateur temporaire maintenant "
-"puis l'utilisateur ou les utilisateurs réel(s) après le redémarrage."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Si vous préférez des répertoires accessibles en lecture par tous, ajoutez "
 "les utilisateurs supplémentaires à l'étape du <emphasis>Résumé</emphasis> de "
 "l'installation, avec le bouton <emphasis>Gestion des utilisateurs</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Gestion avancée de l'Utilisateur"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -389,12 +359,12 @@ msgstr ""
 "permet de modifier les réglages pour l'utilisateur que vous avez ajouté."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -406,7 +376,7 @@ msgstr ""
 "USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -418,7 +388,7 @@ msgstr ""
 "restreints qu'un utilisateur ordinaire."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -429,7 +399,7 @@ msgstr ""
 "choix possibles sont Bash, Dash et Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -440,7 +410,7 @@ msgstr ""
 "entrer ici si vous ne le connaissez pas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -829,12 +799,12 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Sélection du bureau"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -843,7 +813,7 @@ msgstr ""
 "apparaître pour préciser les choix."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -854,16 +824,17 @@ msgstr ""
 "<guilabel>Détails</guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -883,22 +854,23 @@ msgstr ""
 "paquetages installés par défaut."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Sélection du groupe de paquetages"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-choosePackageGroups."
 "png\" format=\"PNG\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -911,22 +883,22 @@ msgstr ""
 "l'infobulle qui devient visible lorsque la souris les survole."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Poste de travail."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Serveur."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Environnement graphique"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -935,10 +907,11 @@ msgstr ""
 "ou retirer manuellement des paquetages."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Lisez <xref linkend=\"minimal-install\"></xref> et suivez le mode opératoire "
 "pour réaliser une installation minimale (sans ou avec X &amp; IceWM)."
@@ -1428,23 +1401,24 @@ msgstr ""
 "prudent dans vos choix."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1457,7 +1431,7 @@ msgstr ""
 "système ne pourra pas s'amorcer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1469,7 +1443,7 @@ msgstr ""
 "modifications."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1479,7 +1453,7 @@ msgstr ""
 "s'ils sont trois."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1488,7 +1462,7 @@ msgstr ""
 "supprimer toutes les partitions du périphérique de stockage sélectionné."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1498,44 +1472,79 @@ msgstr ""
 "la redimensionner ou la supprimer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continuer jusqu'à ce que tout soit conforme aux désirs."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Si vous installez Mageia sur un système équipé d'UEFI, vérifiez qu'une "
 "partition ESP (Partition avec Système EFI) est bien présente et correctement "
 "montée sur /boot/EFI (voir ci-dessus)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Si vous installez Mageia sur un système équipé d'UEFI, vérifiez qu'une "
+"partition ESP (Partition avec Système EFI) est bien présente et correctement "
+"montée sur /boot/EFI (voir ci-dessus)."
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1546,7 +1555,7 @@ msgstr ""
 "installer <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1555,21 +1564,32 @@ msgstr ""
 "contenu et de l'agencement de chaque disque dur en particulier."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Utiliser les partitions existantes"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1578,12 +1598,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Utiliser l'espace libre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1592,12 +1612,12 @@ msgstr ""
 "l'utilisera pour l'installation de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1606,7 +1626,7 @@ msgstr ""
 "l'installateur propose de l'utiliser."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1617,7 +1637,7 @@ msgstr ""
 "assurer de posséder une sauvegarde de tous les fichiers importants."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1635,7 +1655,7 @@ msgstr ""
 "préalable."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1649,7 +1669,7 @@ msgstr ""
 "capture d'écran ci-dessous."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1657,25 +1677,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 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:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Cette option utilise le disque complet pour Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1686,12 +1716,12 @@ msgstr ""
 "perdues, alors ne pas utiliser cette option."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Partitionnement de disque personnalisé"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1700,12 +1730,12 @@ msgstr ""
 "installation sur le(s)  disque(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionnement des partitions :</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1713,7 +1743,7 @@ msgstr ""
 "L'installeur partagera l'espace disponible selon les règles suivantes :"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1723,7 +1753,7 @@ msgstr ""
 "home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1731,7 +1761,7 @@ msgstr ""
 "sont créées. "
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1739,18 +1769,18 @@ msgstr ""
 "répertoires /, jusqu'à un maximum de 50 Go."
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 "Le reste (à minima 12/19ème) est alloué au répertoire utilisateur /home."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1760,7 +1790,7 @@ msgstr ""
 "home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1772,8 +1802,48 @@ msgstr ""
 "sur /boot/EFI. L'option \"Personnalisée\" est la seule qui permet de "
 "vérifier si l'opération a été effectuée correctement "
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1793,17 +1863,17 @@ msgstr ""
 "suivante :"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Align to\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1916,27 +1986,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Félicitations"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" format=\"PNG\" xml:id=\"exitInstall-im1\"></imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1947,7 +2014,7 @@ msgstr ""
 "et de redémarrer l'ordinateur."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1957,7 +2024,7 @@ msgstr ""
 "l'écran du chargeur de démarrage ."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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 +2033,12 @@ msgstr ""
 "l'installation de Mageia sera automatiquement sélectionnée et démarrée."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Prenez plaisir !"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2110,6 +2177,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2788,30 +2860,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Résumé des différents paramètres"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2823,18 +2881,40 @@ msgstr ""
 "ici de vérifier les paramètres et de les changer si souhaité en cliquant sur "
 "<guibutton>Configurer</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Paramètres du système"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fuseau horaire :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2844,12 +2924,12 @@ msgstr ""
 "modifier si nécessaire. Voir aussi <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Pays / Région :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2858,35 +2938,35 @@ msgstr ""
 "rectifier. Voir <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Chargeur de démarrage : </guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr ""
 "Ne rien modifier a moins de connaître comment configurer GRUB et/ou Lilo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestion de l'utilisateur :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2895,12 +2975,12 @@ msgstr ""
 "verra attribuer son propre répertoire <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Services :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2910,7 +2990,7 @@ msgstr ""
 "tâches."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2919,22 +2999,22 @@ msgstr ""
 "erreur peut empêcher le fonctionnement correct de l'ordinateur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Paramètres du matériel"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Clavier </guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2942,13 +3022,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Souris :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2957,12 +3044,12 @@ msgstr ""
 "trackballs etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Carte son :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2973,44 +3060,45 @@ msgstr ""
 "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:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interface graphique : </guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Paramètres réseau et internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Réseau :</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -3024,7 +3112,7 @@ msgstr ""
 "libres (nonfree)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -3033,12 +3121,12 @@ msgstr ""
 "pour qu'il surveille aussi cette interface."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -3049,7 +3137,7 @@ msgstr ""
 "configurer votre ordinateur pour qu'il utilise un service proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -3058,17 +3146,17 @@ msgstr ""
 "les valeurs des paramètres à entrer ici."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Sécurité"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Niveau de sécurité</guilabel> :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3077,18 +3165,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:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Pare-feu</guilabel> :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3098,10 +3186,12 @@ msgstr ""
 "cherchent à les compromettre ou à les voler."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Choisir les services dont l'accès est nécessaire sur le système. Le choix "
 "dépend de l'utilisation de l'ordinateur."
@@ -3113,26 +3203,39 @@ msgstr ""
 "Garder à l'esprit que tout autoriser (pas de pare-feu) est très risqué."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Redémarrage"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Une fois le chargeur d'amorçage installé, vous serez invité à arrêter "
+"l'ordinateur, retirer le live CD,  puis redémarrer.  Lors du redémarrage, "
+"vous pourrez observer une succession de barres de progression de chargement. "
+"Cela indique que le média logiciel est en cours de chargement (voir Gestion "
+"des logiciels)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Une fois le chargeur d'amorçage installé, vous serez invité à arrêter "
 "l'ordinateur, retirer le live CD,  puis redémarrer.  Lors du redémarrage, "
@@ -3140,6 +3243,16 @@ msgstr ""
 "Cela indique que le média logiciel est en cours de chargement (voir Gestion "
 "des logiciels)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3200,17 +3313,17 @@ msgstr ""
 "Contrôle de Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Sélectionner et utiliser les ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introduction"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3219,12 +3332,12 @@ msgstr ""
 "quelle image correspond à vos besoins."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Il existe deux familles de media :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3238,7 +3351,7 @@ msgstr ""
 "souhaitez installer. "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3249,22 +3362,22 @@ msgstr ""
 "processus d'installation est plus simple, mais vous aurez moins de choix."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Définition"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3275,7 +3388,7 @@ msgstr ""
 "physique sur lequel le fichier ISO est copié."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3284,23 +3397,23 @@ msgstr ""
 "\">ici</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Média d'installation classique"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Caractéristiques communes"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3308,17 +3421,17 @@ msgstr ""
 "de versions précédentes."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Un média différent pour les architectures 32 ou 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3327,59 +3440,26 @@ 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:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Vous aurez la possibilité durant l'installation d'ajouter des logiciels non-"
 "libres."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Toutes les architectures sont présentes sur le même médium, le choix de "
-"l'une d'entre elle est réalisé automatiquement selon le CPU détecté."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Utilise le bureau Xfce uniquement."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Toutes les langues ne sont pas disponibles. Seules les suivantes (be, bg, "
-"ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk) peuvent être sélectionnées !"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Il contient des logiciels non libres."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Média \"Live\""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3388,19 +3468,21 @@ msgstr ""
 "disque dur, puis éventuellement l'installer par la suite."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 "Chaque image ISO contient un seul environnement de bureau (KDE ou GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3411,63 +3493,57 @@ msgstr ""
 "niveau de précédentes versions.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Ils contiennent des logiciels non-libres."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "CD live KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "DVD live KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Environnement de bureau KDE uniquement."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "En anglais uniquement."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "32 bits seulement."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Toutes les langues sont présentes."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "CD live GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "DVD Live GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Environnement de bureau GNOME uniquement."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "DVD live KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Toutes les langues sont présentes."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "DVD Live GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Environnement de bureau KDE uniquement."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Média de simple démarrage"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3481,7 +3557,7 @@ 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:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3491,13 +3567,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "En anglais uniquement."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Lancer l'installation"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3506,12 +3588,13 @@ msgstr ""
 "d'utiliser des logiciels non-libres."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3520,17 +3603,17 @@ msgstr ""
 "codecs,...) pour les personnes qui en ont besoin."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Télécharger et vérifier les média"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Téléchargement"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3544,12 +3627,12 @@ msgstr ""
 "(HTTP), vous pouvez également voir quelque chose comme"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3561,22 +3644,22 @@ msgstr ""
 "suivante apparaît alors :"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Cochez le bouton radio \"Sauvegarder un fichier\""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Vérification de l'intégrité du média téléchargé"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3592,12 +3675,12 @@ msgstr ""
 "obligera à retélécharger celui-ci."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3606,7 +3689,7 @@ msgstr ""
 "vers/le/fichier/image.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3615,7 +3698,7 @@ msgstr ""
 "vers/le/fichier/image.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3624,17 +3707,17 @@ msgstr ""
 "certain temps) avec le nombre fourni par Mageia. Exemple :"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Graver ou copier l'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3644,12 +3727,12 @@ msgstr ""
 "un moyen de démarrage."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3663,12 +3746,12 @@ msgstr ""
 "mageia.org/en/Writing_CD_and_DVD_images\">le wiki Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3678,7 +3761,7 @@ msgstr ""
 "le système."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3689,7 +3772,7 @@ msgstr ""
 "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:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3698,12 +3781,12 @@ msgstr ""
 "le partitionnement et reformater la clé."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3713,17 +3796,17 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Vous pouvez essayer :"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3732,7 +3815,7 @@ msgstr ""
 "utilisant l'option \"image ISO\" ;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3741,12 +3824,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3755,17 +3838,17 @@ msgstr ""
 "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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Ouvrir une console"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3774,12 +3857,12 @@ msgstr ""
 "oublier le '-' final)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3789,17 +3872,17 @@ msgstr ""
 "ou la lire)."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3811,7 +3894,7 @@ msgstr ""
 "emphasis> comme dans ce cas :"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3853,7 +3936,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3863,7 +3946,7 @@ msgstr ""
 "clé USB de 8 Go."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3872,12 +3955,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 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:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3886,37 +3969,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Débranchez votre clé USB, c'est terminé."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Sélection du Pays / Région"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3925,7 +4008,7 @@ msgstr ""
 "pays erroné peut mener à l'incapacité d'utiliser le réseau par wi-fi."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3934,7 +4017,7 @@ msgstr ""
 "<guilabel>Autres pays</guilabel> et choisir ici le pays ou la région."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3947,21 +4030,20 @@ msgstr ""
 "DrakX respectera votre choix."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Méthode de saisie"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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>, une méthode de saisie des "
 "caractères peut être sélectionnée (à la fin de la liste). Les méthodes de "
@@ -3976,10 +4058,11 @@ msgstr ""
 "avant la sélection des paquetages."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Si la méthode de saisie n'est pas configurée pendant la phase "
@@ -4325,364 +4408,394 @@ msgstr ""
 "à six boutons ou plus."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Pour plus d'information sur les options du noyau sur les systèmes en mode "
+"Legacy ou avec UEFI, consulter : <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Principales options du chargeur de démarrage"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Avec un système BIOS"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Principales options du chargeur de démarrage"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Vous pouvez ajouter une entrée ou en modifier une après l'avoir "
-"sélectionnée, en pressant le bouton correspondant dans l'écran de "
-"<emphasis>Configuration du démarrage</emphasis> et en éditant les entrées de "
-"la fenêtre qui s'ouvre à ce moment."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Avec un système UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "Les menus graphiques de Mageia sont jolis :"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Si vous avez choisi <code>Grub 2</code> comme chargeur de démarrage, vous ne "
-"pouvez pas utliser cet outil pour modifier les entrées à cette étape, "
-"appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier <code>/"
-"boot/grub2/custom.cfg</code> ou utiliser <code>grub-customizer</code> à la "
-"place."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+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:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Avec un système UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Le changement du nom d'une entrée et l'activation de la case à cocher pour "
-"définir l'entrée par défaut sont des actions qui ne comportent pas de "
-"risques."
+"Avec un système UEFI, l'interface utilisateur est légèrement différente : "
+"vous ne pouvez pas choisir le chargeur de démarrage car seul Grub2-efi est "
+"disponible."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Vous pouvez ajouter votre propre version du numéro d'une entrée ou la "
-"renommer complètement."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"L'entrée par défaut est celle qui est choisie lorsque aucun choix n'est fait "
-"pendant la phase de démarrage du système."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Modifier d'autres choses peut vous laisser avec un système non-démarrable. "
-"N'essayez pas quoi que ce soit sans savoir ce que vous faites."
+"Si Mageia est le premier système installé sur votre ordinateur, "
+"l'installateur créé une partition ESP (Partition système EFI) pour reçevoir "
+"le chargeur d'amorçage (Grub2-efi). Si un système d'exploitation utilisant "
+"l'UEFI est déjà présent sur votre ordinateur (Windows 8 par exemple), "
+"l'installateur de Mageia détecte la partition ESP existante créée par "
+"Windows et ajoute grub2-efi. Bien qu'il soit possible d'avoir plusieurs "
+"ESPs, une seule est conseillée (et suffit), peu importe le nombre de "
+"systèmes d'exploitation que vous utilisez."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Avec un système UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Utiliser un chargeur de démarrage Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Dans ce cas, vous utilisez Grub2-efi et vous ne pouvez pas utiliser cet "
-"outil pour modifier les entrées à cette étape. Pour faire cela, vous devez "
-"modifier manuellement <code>/boot/grub2/custom.cfg</code> ou utiliser "
-"<code>grub-customizer</code> à la place. Tout ce que vous pouvez faire ici, "
-"c'est choisir l'entrée par défaut dans la liste déroulante."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Après avoir cliqué sur le bouton <guibutton>Suivant</guibutton>, une autre "
-"liste déroulante permet de choisir la résolution vidéo pour Grub2, qui est "
-"le chargeur de démarrage graphique."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Principales options du chargeur de démarrage"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Utiliser un chargeur de démarrage existant.  "
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+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 "
+"temps, elle exige d'exécuter le programme d'installation du chargeur de "
+"démarrage impliqué qui devrait le détecter et l'installer automatiquement. "
+"Voir la documentation du système d'exploitation en question."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Si vous souhaitez, pour le chargeur de démarrage, des paramètres différents "
-"de ceux choisis automatiquement par l'installateur, les changer ici."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Il peut y avoir déjà un autre système d'exploitation sur la machine, auquel "
-"cas il faut décider entre ajouter Mageia au chargeur de démarrage existant "
-"ou autoriser Mageia à en créer un autre. "
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Les menus graphiques de Mageia sont jolis :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Utiliser un chargeur de démarrage Mageia"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Par défaut, Mageia écrit un nouveau chargeur d'amorçage GRUB (Legacy) dans "
-"le MBR  (Master Boot Record) de votre premier disque dur. Si d'autres "
-"systèmes d'exploitation sont déjà installés, Mageia tentera de les ajouter "
-"dans votre nouveau menu de démarrage Mageia."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Mageia offre aussi maintenant GRUB2 comme chargeur de démarrage optionnel en "
-"plus de GRUB legacy et Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
-"Les systèmes Linux qui utilisent le chargeur GRUB2 ne sont pas actuellement "
-"supportés par GRUB (legacy) et ne seront pas reconnus si le chargeur de "
-"démarrage GRUB est utilisé."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"La meilleure solution ici est d'utiliser le chargeur de démarrage GRUB2 qui "
-"est disponible pendant l'installation à la page du résumé."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Utiliser un chargeur de démarrage existant.  "
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Si vous décidez d'utiliser un chargeur de démarrage existant, vous devez "
-"alors vous souvenir de vous ARRETER pendant l'installation à la page du "
-"résumé et de cliquer sur le bouton <guibutton>Configurer</guibutton>, lequel "
-"permet de modifier le lieu d'installation du chargeur de démarrage."
+"<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."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Services :</guilabel>"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Ne sélectionnez pas un périphérique tel que \"sda\" car sinon vous allez "
-"écrasez votre MBR actuel. Vous devez sélectionner la partition que vous avez "
-"choisi lors de la phase de partitionnement précédente, par exemple sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Pour être clair, sda est un périphérique, sda7 est une partition de ce "
-"périphérique."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Ouvrir tty2 avec Ctrl+Alt+F2 et taper <literal>df</literal> pour vérifier où "
-"est la partition <literal>/</literal> (root).  Ctrl+Alt+F7 ramène dans "
-"l'écran de l'installateur."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"temps, elle exige d'exécuter le programme d'installation du chargeur de "
-"démarrage impliqué qui devrait le détecter et l'installer automatiquement. "
-"Voir la documentation du système d'exploitation en question."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Option avancée du chargeur de démarrage "
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Si la place sur le disque est très limitée pour la partition <literal>/</"
-"literal> qui contient <literal>/tmp</literal>, cliquer sur "
-"<guibutton>Advancé</guibutton> et cocher la case <guilabel>Vider le dossier /"
-"tmp à chaque démarrage</guilabel>. Cela aide à maintenir un peu de place "
-"libre."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Avec un système UEFI, l'interface utilisateur est légèrement différente : "
-"vous ne pouvez pas choisir le chargeur de démarrage car seul Grub2-efi est "
-"disponible."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Si Mageia est le premier système installé sur votre ordinateur, "
-"l'installateur créé une partition ESP (Partition système EFI) pour reçevoir "
-"le chargeur d'amorçage (Grub2-efi). Si un système d'exploitation utilisant "
-"l'UEFI est déjà présent sur votre ordinateur (Windows 8 par exemple), "
-"l'installateur de Mageia détecte la partition ESP existante créée par "
-"Windows et ajoute grub2-efi. Bien qu'il soit possible d'avoir plusieurs "
-"ESPs, une seule est conseillée (et suffit), peu importe le nombre de "
-"systèmes d'exploitation que vous utilisez."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 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><info><title>
 #: en/setupSCSI.xml:11
@@ -4733,22 +4846,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX pourra alors les configurer correctement."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Configuration du son"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4758,7 +4872,7 @@ msgstr ""
 "carte son. Ce sera le pilote par défaut si vous en avez un."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4774,7 +4888,7 @@ msgstr ""
 "haut à droite de l'écran."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4785,12 +4899,12 @@ msgstr ""
 "conseils très utiles afin de résoudre le problème."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avancé"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4802,7 +4916,7 @@ msgstr ""
 "pilote."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4976,12 +5090,12 @@ msgid "Uninstalling Mageia"
 msgstr "Désinstaller Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Guide"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4993,7 +5107,7 @@ msgstr ""
 "systèmes d'exploitation."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -5005,7 +5119,7 @@ msgstr ""
 "sans aucun menu pour choisir votre système d'exploitation."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -5025,7 +5139,7 @@ msgstr ""
 "guibutton>. L'espace sera alors libéré."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -5035,7 +5149,7 @@ msgstr ""
 "partition."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -5097,6 +5211,318 @@ msgstr ""
 "vide pendant un certain temps, c'est normal."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Cependant, tout nouvel utilisateur ajouté par l'intermédiaire du Centre "
+#~ "de Contrôle de Mageia (CCM) aura un répertoire protégé en écriture et en "
+#~ "lecture pour les autres utilisateurs."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Si vous ne désirez pas que le répertoire personnel soit visible par tout "
+#~ "le monde, nous vous conseillons d'ajouter un utilisateur temporaire "
+#~ "maintenant puis l'utilisateur ou les utilisateurs réel(s) après le "
+#~ "redémarrage."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Toutes les architectures sont présentes sur le même médium, le choix de "
+#~ "l'une d'entre elle est réalisé automatiquement selon le CPU détecté."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Utilise le bureau Xfce uniquement."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Toutes les langues ne sont pas disponibles. Seules les suivantes (be, bg, "
+#~ "ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk) peuvent être "
+#~ "sélectionnées !"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Il contient des logiciels non libres."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "CD live KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "32 bits seulement."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "CD live GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Avec un système BIOS"
+
+#~ 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."
+#~ msgstr ""
+#~ "Vous pouvez ajouter une entrée ou en modifier une après l'avoir "
+#~ "sélectionnée, en pressant le bouton correspondant dans l'écran de "
+#~ "<emphasis>Configuration du démarrage</emphasis> et en éditant les entrées "
+#~ "de la fenêtre qui s'ouvre à ce moment."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Si vous avez choisi <code>Grub 2</code> comme chargeur de démarrage, vous "
+#~ "ne pouvez pas utliser cet outil pour modifier les entrées à cette étape, "
+#~ "appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier <code>/"
+#~ "boot/grub2/custom.cfg</code> ou utiliser <code>grub-customizer</code> à "
+#~ "la place."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Le changement du nom d'une entrée et l'activation de la case à cocher "
+#~ "pour définir l'entrée par défaut sont des actions qui ne comportent pas "
+#~ "de risques."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Vous pouvez ajouter votre propre version du numéro d'une entrée ou la "
+#~ "renommer complètement."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "L'entrée par défaut est celle qui est choisie lorsque aucun choix n'est "
+#~ "fait pendant la phase de démarrage du système."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Modifier d'autres choses peut vous laisser avec un système non-"
+#~ "démarrable. N'essayez pas quoi que ce soit sans savoir ce que vous faites."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Dans ce cas, vous utilisez Grub2-efi et vous ne pouvez pas utiliser cet "
+#~ "outil pour modifier les entrées à cette étape. Pour faire cela, vous "
+#~ "devez modifier manuellement <code>/boot/grub2/custom.cfg</code> ou "
+#~ "utiliser <code>grub-customizer</code> à la place. Tout ce que vous pouvez "
+#~ "faire ici, c'est choisir l'entrée par défaut dans la liste déroulante."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Après avoir cliqué sur le bouton <guibutton>Suivant</guibutton>, une "
+#~ "autre liste déroulante permet de choisir la résolution vidéo pour Grub2, "
+#~ "qui est le chargeur de démarrage graphique."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Si vous souhaitez, pour le chargeur de démarrage, des paramètres "
+#~ "différents de ceux choisis automatiquement par l'installateur, les "
+#~ "changer ici."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Il peut y avoir déjà un autre système d'exploitation sur la machine, "
+#~ "auquel cas il faut décider entre ajouter Mageia au chargeur de démarrage "
+#~ "existant ou autoriser Mageia à en créer un autre. "
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Par défaut, Mageia écrit un nouveau chargeur d'amorçage GRUB (Legacy) "
+#~ "dans le MBR  (Master Boot Record) de votre premier disque dur. Si "
+#~ "d'autres systèmes d'exploitation sont déjà installés, Mageia tentera de "
+#~ "les ajouter dans votre nouveau menu de démarrage Mageia."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia offre aussi maintenant GRUB2 comme chargeur de démarrage optionnel "
+#~ "en plus de GRUB legacy et Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Les systèmes Linux qui utilisent le chargeur GRUB2 ne sont pas "
+#~ "actuellement supportés par GRUB (legacy) et ne seront pas reconnus si le "
+#~ "chargeur de démarrage GRUB est utilisé."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "La meilleure solution ici est d'utiliser le chargeur de démarrage GRUB2 "
+#~ "qui est disponible pendant l'installation à la page du résumé."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Si vous décidez d'utiliser un chargeur de démarrage existant, vous devez "
+#~ "alors vous souvenir de vous ARRETER pendant l'installation à la page du "
+#~ "résumé et de cliquer sur le bouton <guibutton>Configurer</guibutton>, "
+#~ "lequel permet de modifier le lieu d'installation du chargeur de démarrage."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Ne sélectionnez pas un périphérique tel que \"sda\" car sinon vous allez "
+#~ "écrasez votre MBR actuel. Vous devez sélectionner la partition que vous "
+#~ "avez choisi lors de la phase de partitionnement précédente, par exemple "
+#~ "sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Pour être clair, sda est un périphérique, sda7 est une partition de ce "
+#~ "périphérique."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Ouvrir tty2 avec Ctrl+Alt+F2 et taper <literal>df</literal> pour vérifier "
+#~ "où est la partition <literal>/</literal> (root).  Ctrl+Alt+F7 ramène dans "
+#~ "l'écran de l'installateur."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Option avancée du chargeur de démarrage "
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Si la place sur le disque est très limitée pour la partition <literal>/</"
+#~ "literal> qui contient <literal>/tmp</literal>, cliquer sur "
+#~ "<guibutton>Advancé</guibutton> et cocher la case <guilabel>Vider le "
+#~ "dossier /tmp à chaque démarrage</guilabel>. Cela aide à maintenir un peu "
+#~ "de place libre."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -5113,10 +5539,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
 #~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 #~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index a1e946b2..df577e37 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-02-10 18:38+0200\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -3705,7 +3705,7 @@ msgstr ""
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:241
 msgid ""
-"P<guilabel>robe foreign OS</guilabel>: see above <link "
+"<guilabel>Probe foreign OS</guilabel>: see above <link "
 "linkend=\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index 709c76f2..77674a23 100644
--- a/docs/installer/hr.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-09-15 12:17+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -178,26 +178,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Upravljanje korisnikom i superkorisnikom"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -205,12 +194,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Poostavi administratorsku (root) lozinku:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -230,7 +219,7 @@ msgstr ""
 "lozinku uspoređujući ih."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -239,12 +228,12 @@ msgstr ""
 "mješavinu slova (velikih i malih), brojeva i ostalih znakova u lozinki."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Unesite korisnika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -255,7 +244,7 @@ msgstr ""
 "sve ostalo što prosječan korisnik radi sa svojim računalom."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -264,7 +253,7 @@ msgstr ""
 "korisnika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -273,7 +262,7 @@ msgstr ""
 "polje."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -284,7 +273,7 @@ msgstr ""
 "prijave je osjetljivo na mala i velika slova.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -295,7 +284,7 @@ msgstr ""
 "lozinke.(Također vidi <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -306,49 +295,35 @@ msgstr ""
 "tekstualnom polju."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Svaki korisnik kojeg dodate tijekom instalacije Mageie, će imati čitljiv "
 "( ali zaštićen za pisanje) osobni direktorij."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:83
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
+"You can add all 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:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"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:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Napredno korisničko upravljanje"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -357,12 +332,12 @@ msgstr ""
 "gdje možete urediti postavke korisnika kojega dodajete."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -370,7 +345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -381,7 +356,7 @@ msgstr ""
 "ja, ali ima ograničeniji pristup od normalnih korisnika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -389,7 +364,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -397,7 +372,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -730,12 +705,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Odabir radnog okruženja"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -744,7 +719,7 @@ msgstr ""
 "ugađanje vašega izbora."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -752,16 +727,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -773,22 +749,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Odabir grupe paketa"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -797,22 +774,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Radna stanica"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Poslužitelj"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafičko okruženje"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -821,10 +798,10 @@ msgstr ""
 "ili uklanajnje paketa."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1233,20 +1210,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1255,7 +1236,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1263,61 +1244,90 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1325,57 +1335,69 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Koristi postojeće particije"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Koristi slobodni prostor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 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:44
+#: en/doPartitionDisks.xml:52
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
 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:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1383,7 +1405,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1394,7 +1416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1403,29 +1425,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Izbriši i koristi cijeli disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ova će opcija koristiti cijeli pogon za Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1433,67 +1464,67 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Prilagođeno"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 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:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1501,8 +1532,47 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1514,17 +1584,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1623,24 +1693,23 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Čestitamo"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </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/exitInstall.xml:21
+#: 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 "
@@ -1650,26 +1719,26 @@ msgstr ""
 "i sada je sigurno ukloniti instalcijski medij i napraviti reboot računala."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Uživajte!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1776,6 +1845,11 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2284,28 +2358,17 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2313,18 +2376,40 @@ msgid ""
 "<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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2332,110 +2417,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, 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:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+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:75
+#: en/misc-params.xml:69
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 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:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 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:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr ""
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2443,39 +2534,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.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><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2484,19 +2579,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2504,51 +2599,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Sigurnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2557,27 +2653,43 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Ponovno pokretanje sustava"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
@@ -2628,29 +2740,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Uvod"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2659,7 +2771,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2667,22 +2779,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2690,116 +2802,88 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr ""
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -2807,63 +2891,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -2872,49 +2946,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr ""
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -2923,12 +3002,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -2936,22 +3015,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -2961,55 +3040,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3018,19 +3097,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3038,101 +3117,101 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3140,7 +3219,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3164,73 +3243,75 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.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/selectCountry.xml:27
+#: en/selectCountry.xml:14
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3239,28 +3320,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3519,286 +3598,364 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Glavne postavke bootloadera"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Glavne postavke bootloadera"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Glavne postavke bootloadera"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
-msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
+"<guilabel>Lozinka (ponovno)</guilabel>: Ponovno upišite korisničku lozinku u "
+"ovo tekstualno polje i drakx će provjeriti imate li istu lozinku u svakom "
+"tekstualnom polju."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -3842,20 +3999,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Konfiguracija zvuka"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-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/soundConfig.xml:23
+#: 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 "
@@ -3863,7 +4023,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -3873,7 +4033,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -3881,12 +4041,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Napredno"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -3894,7 +4054,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4042,12 +4202,12 @@ msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4055,7 +4215,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4063,7 +4223,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4075,14 +4235,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4129,3 +4289,38 @@ 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 ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
diff --git a/docs/installer/hu.po b/docs/installer/hu.po
index 3fc65c33..4b1a71fe 100644
--- a/docs/installer/hu.po
+++ b/docs/installer/hu.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-08-24 11:58+0000\n"
 "Last-Translator: gergo huba <hubasetech@gmail.com>\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -149,35 +149,23 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr ""
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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:39
+#: 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:43
+#: 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 "
@@ -190,19 +178,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Adjon meg egy felhasználót"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -210,7 +198,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -219,14 +207,14 @@ msgstr ""
 "ikonja megváltozik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users 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:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -234,7 +222,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -242,7 +230,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -250,59 +238,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
-msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:80
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all 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:115
+#: en/addUser.xml:87
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Speciális Felhasználókezelés"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -310,7 +283,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -318,7 +291,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -326,7 +299,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -334,7 +307,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -633,19 +606,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Munkaasztal kiválasztása"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "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:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -653,14 +626,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -672,20 +645,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Csomagcsoportok kiválasztása"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -694,32 +667,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Munkaállomás."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Kiszolgáló."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafikus környezet"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1093,20 +1066,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: 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:34
+#: 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 "
@@ -1115,7 +1088,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1123,61 +1096,84 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
 msgstr ""
 
 #. 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:10
+#: 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 "
@@ -1185,57 +1181,64 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 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:44
+#: en/doPartitionDisks.xml:52
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
 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:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1243,7 +1246,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1254,7 +1257,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1263,29 +1266,36 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1293,67 +1303,67 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Egyéni"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 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:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1361,8 +1371,39 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1374,17 +1415,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1483,24 +1524,20 @@ msgid "Mageia 4"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulálunk"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<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:21
+#: 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 "
@@ -1508,26 +1545,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1632,6 +1669,11 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2138,28 +2180,15 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2167,18 +2196,40 @@ msgid ""
 "<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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2186,110 +2237,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, 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:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+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:75
+#: en/misc-params.xml:69
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 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:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 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:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr ""
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2297,39 +2354,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </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:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2338,19 +2395,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2358,51 +2415,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Biztonság"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2411,24 +2469,37 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Újraindítás"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2480,29 +2551,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Bevezetés"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2511,7 +2582,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2519,22 +2590,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2542,116 +2613,88 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr ""
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -2659,63 +2702,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -2724,49 +2757,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr ""
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -2775,12 +2813,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -2788,22 +2826,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -2813,55 +2851,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -2870,19 +2908,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -2890,101 +2928,101 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -2992,7 +3030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3016,73 +3054,71 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"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:27
+#: en/selectCountry.xml:14
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3091,28 +3127,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3364,267 +3398,335 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Rendszerindítási beállítások"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Rendszerindítási beállítások"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Rendszerindítási beállítások"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
-msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+msgid "<guilabel>Advanced</guilabel>"
 msgstr ""
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -3668,20 +3770,20 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Hang beállítása"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </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:23
+#: 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 "
@@ -3689,7 +3791,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -3699,7 +3801,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -3707,12 +3809,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Speciális"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -3720,7 +3822,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -3865,12 +3967,12 @@ msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -3878,7 +3980,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -3886,7 +3988,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -3898,14 +4000,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
diff --git a/docs/installer/id.po b/docs/installer/id.po
index 8aa1b92d..9c89ea4e 100644
--- a/docs/installer/id.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 09:04+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -178,26 +178,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Pengelolaan Pengguna dan Pengguna Super"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -205,12 +194,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Atur Sandi Administrator (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -231,7 +220,7 @@ msgstr ""
 "sandi pada sandi pertama dengan membandingkannya."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -240,12 +229,12 @@ msgstr ""
 "penggabungan huruf (besar dan kecil), nomor dan karakter lain sebagai sandi."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Masukkan pengguna"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -257,7 +246,7 @@ msgstr ""
 "biasa dilakukan pengguna dengan komputernya"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -266,7 +255,7 @@ msgstr ""
 "ikon pengguna."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -275,7 +264,7 @@ msgstr ""
 "ini."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -286,7 +275,7 @@ msgstr ""
 "login berlaku sensitif.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -297,7 +286,7 @@ msgstr ""
 "kekuatan sandi. (Lihat juga <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -308,41 +297,22 @@ msgstr ""
 "tiap kotak teks."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (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:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Akan tetapi, saat menggunakan instalasi baru, setiap pengguna yang Anda "
-"tambahkan di <emphasis>MCC - Sistem - Kelola pengguna pada sistem</emphasis> "
-"akan memiliki direktori home yang terproteksi pembacaan dan penulisan."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Jika Anda tidak ingin direktori home bisa dibaca semua orang, disarankan "
-"untuk sekarang hanya menambahkan pengguna sementara dan menambahkan yang "
-"sebenarnya setelah menyalakan ulang komputer."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Jika Anda lebih suka direktori home bisa dilihat semua orang, Anda mungkin "
 "ingin menambahkan pengguna tambahan pada langkah <emphasis>Konfigurasi - "
@@ -350,17 +320,17 @@ msgstr ""
 "emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Pengelolaan Pengguna Lanjutan"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -370,12 +340,12 @@ msgstr ""
 "tambahkan."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -386,7 +356,7 @@ msgstr ""
 "menyimpan file pentingnya ke dalam flashdisk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -398,7 +368,7 @@ msgstr ""
 "normal."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -409,7 +379,7 @@ msgstr ""
 "sebelumnya, pilihannya adalah Bash, Dash dan Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -421,7 +391,7 @@ msgstr ""
 "sini."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -757,12 +727,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Pemilihan Desktop"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -771,7 +741,7 @@ msgstr ""
 "lanjutan untuk menyesuaikan pilihan."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -782,16 +752,17 @@ msgstr ""
 "<guilabel>Rincian</guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -811,22 +782,23 @@ msgstr ""
 "terlihat cantik dan lebih sedikit paket bawaan yang diinstall."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Pemilihan Grup Paket"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -839,22 +811,22 @@ msgstr ""
 "saat mouse di arahkan ke grup-grup tersebut."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Lingkungan kerja."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Lingkungan Grafis"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -863,10 +835,10 @@ msgstr ""
 "atau menghapus paket secara manual."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1347,20 +1319,24 @@ msgstr ""
 "sangat bijaksana jika Anda memilih yang sederhana."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1373,7 +1349,7 @@ msgstr ""
 "Anda tidak akan bisa berjalan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1384,7 +1360,7 @@ msgstr ""
 "melihat apa di dalamnya sebelum Anda memulai."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1393,7 +1369,7 @@ msgstr ""
 "lainnya, seperti flashdisk. Contohnya sda, sdb dan sdc jika ada tiga."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1402,7 +1378,7 @@ msgstr ""
 "partisi pada perangkat penyimpanan terpilih"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1411,43 +1387,77 @@ msgstr ""
 "tampilkan, atau pilih filesystem dan titik kait, ubah ukuran atau bersihkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Lanjutkan hingga Anda mengatur semua yang Anda inginkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Jika Anda menginstall Mageia pada sistem UEFI, periksa bahwa ESP (EFI System "
+"Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1458,7 +1468,7 @@ msgstr ""
 "application> akan diinstall."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1467,21 +1477,32 @@ msgstr ""
 "tampilan dan isi perangkat disk Anda."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Gunakan Partisi yang Tersedia"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1490,12 +1511,12 @@ msgstr ""
 "ditemukan dan mungkin bisa digunakan untuk instalasi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Gunakan Ruang Kosong"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1504,12 +1525,12 @@ msgstr ""
 "ini akan menggunakannya untuk menginstall Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1518,7 +1539,7 @@ msgstr ""
 "installer akan menawarkan untuk menggunakannya."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1528,7 +1549,7 @@ msgstr ""
 "beresiko sehingga Anda harus membuat cadangan file penting Anda!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1544,7 +1565,7 @@ msgstr ""
 "Sangat disarankan untuk membuat cadangan semua file pribadi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1558,7 +1579,7 @@ msgstr ""
 "kedua partisi. Lihat gambar di bawah."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1566,25 +1587,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Hapus dan gunakan Seluruh Disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Pilihan ini akan menggunakan seluruh perangkat untuk Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1595,12 +1626,12 @@ msgstr ""
 "gunakan pilihan ini."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Sesuaian"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1608,55 +1639,55 @@ msgstr ""
 "Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1664,8 +1695,48 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1684,17 +1755,17 @@ msgstr ""
 "berikut:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Selaraskan ke\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Ruang kosong di awal (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "Juga pastikan semua partisi dibuat dengan penomoran megabite."
@@ -1805,27 +1876,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Selamat"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1836,7 +1904,7 @@ msgstr ""
 "menjalankan ulang komputer."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1845,7 +1913,7 @@ msgstr ""
 "sistem operasi pada komputer Anda (jika ada lebih dari satu)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1854,12 +1922,12 @@ msgstr ""
 "otomatis terpilih dan dijalankan."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Nikmatilah!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1993,6 +2061,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2636,30 +2709,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Ringkasan dari berbagai parameter"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2671,18 +2730,40 @@ msgstr ""
 "Anda bisa memeriksanya di sini dan mengubahnya jika Anda mau setelah menekan "
 "<guibutton>Konfigurasi</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parameter sistem"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zona Waktu</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2692,12 +2773,12 @@ msgstr ""
 "mengubahnya jika perlu. Lihat juga <xref linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Negara / Wilayah</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2706,35 +2787,35 @@ msgstr ""
 "memperbaiki pengaturan. Lihat <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Bootloader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Pengelolaan pengguna</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2743,12 +2824,12 @@ msgstr ""
 "direktori <literal>/home</literal> masing-masing."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Layanan</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2758,7 +2839,7 @@ msgstr ""
 "tugas-tugas tertentu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2767,22 +2848,22 @@ msgstr ""
 "sebuah kesalahan bisa menghalangi komputer untuk berjalan dengan semestinya."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Parameter hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Keyboard</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2790,13 +2871,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mouse</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2805,12 +2893,12 @@ msgstr ""
 "tablet, trackball, dsb."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Perangkat suara</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2821,42 +2909,44 @@ msgstr ""
 "Anda, tapi tidak satupun merupakan pilihan baku."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Antarmuka grafis</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Parameter Jaringan dan Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Jaringan</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2869,7 +2959,7 @@ msgstr ""
 "Anda belum menghidupkan reporitory media Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2878,12 +2968,12 @@ msgstr ""
 "firewall untuk melihat antarmuka jaringan tersebut."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2894,7 +2984,7 @@ msgstr ""
 "komputer untuk memanfaatkan layanan proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2903,17 +2993,17 @@ msgstr ""
 "parameter yang diperlukan untuk dimasukkan di sini"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Keamanan"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Tingkat Keamanan</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2922,17 +3012,17 @@ msgstr ""
 "(Standar) adalah yang paling memadai untuk penggunaan umum."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -2941,10 +3031,12 @@ msgstr ""
 "para penjahat di internet yang bermaksud untuk membahayakan atau mencurinya."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Pilih layanan yang ingin bisa diakses ke sistem komputer Anda. Pilihan akan "
 "tergantung pada komputer Anda akan digunakan untuk apa."
@@ -2955,28 +3047,44 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "Ingat bahwa membiarkan semua (tanpa firewall) akan sangat beresiko."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Boot Ulang"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3038,29 +3146,29 @@ msgstr ""
 "bagian <guilabel>Keamanan</guilabel> pada Pusat Kendali Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Pilih dan gunakan ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Pengantar"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3069,7 +3177,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3077,22 +3185,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definisi"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3103,7 +3211,7 @@ msgstr ""
 "fisik ke mana berkas ISO disalin."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3112,39 +3220,39 @@ msgstr ""
 "\">di sini</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Media instalasi klasik"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Fitur umum"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr "Mereka bisa membuat instalasi baru atau update dari rilis sebelumnya."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Media berbeda untuk arsitektur 32 atau 64 bit."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3153,57 +3261,24 @@ msgstr ""
 "Pengujian Memori, Peralatan Pendeteksi Perangkat Keras."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 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><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Kedua arsitektur tersedia dalam media yang sama, pilihan dibuat otomatis "
-"berdasarkan CPU yang terdeteksi."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Hanya menggunakan desktop Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Tidak semua bahasa tersedia. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, "
-"ru, sv, uk) UNTUK DIPILIH!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Ini berisi perangkat lunak non free."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Media live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3212,18 +3287,20 @@ msgstr ""
 "opsi untuk menginstall Mageia pada HDD Anda."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, 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:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3234,63 +3311,57 @@ msgstr ""
 "sebelumnya.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Mereka berisi perangkat lunak non free."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Hanya lingkungan desktop KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Hanya bahasa Inggris."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Hanya 32 bit."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Menyediakan semua bahasa."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Hanya lingkungan desktop GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Menyediakan semua bahasa."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Hanya lingkungan desktop KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Media CD hanya-boot"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3304,7 +3375,7 @@ msgstr ""
 "drive lokal, jaringan lokal atau Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3314,13 +3385,18 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Hanya bahasa Inggris."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3329,12 +3405,13 @@ msgstr ""
 "menggunakan perangkat lunak tidak bebas."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3343,17 +3420,17 @@ msgstr ""
 "untuk orang-orang yang membutuhkannya."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Mengunduh dan Memeriksa Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Mengunduh"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3366,12 +3443,12 @@ msgstr ""
 "terlalu lambat. Jika http dipilih, Anda juga mungkin melihat"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3379,22 +3456,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Centang tombol Simpan Berkas."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Memeriksa keabsahan media yang diunduh"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3404,12 +3481,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3418,7 +3495,7 @@ msgstr ""
 "to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3427,7 +3504,7 @@ msgstr ""
 "to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3436,17 +3513,17 @@ msgstr ""
 "menunggu beberapa saat) dengan nomor yang diberikan oleh Mageia. Contoh:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Bakar atau salin ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3456,12 +3533,12 @@ msgstr ""
 "bertujuan untuk membuat media yang dapat diboot."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Membakar ISO ke CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3474,12 +3551,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:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "Salin ISO ke flashdisk"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3488,7 +3565,7 @@ msgstr ""
 "flashdisk lalu menggunakannya untuk memboot dan menginstall sistem."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3499,19 +3576,19 @@ msgstr ""
 "menjadi sebesar ukuran image."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3520,24 +3597,24 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Anda bisa mencoba:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3546,29 +3623,29 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Buka konsol"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3577,12 +3654,12 @@ msgstr ""
 "'-' di akhir)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3591,17 +3668,17 @@ msgstr ""
 "manajer berkas apapun yang bisa membuka atau membacanya)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3609,7 +3686,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3633,14 +3710,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3649,12 +3726,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Dimana X=nama perangkat Anda misal: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3663,37 +3740,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Lepas flashdisk, selesai"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Pilih Negara / Wilayah Anda"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3702,7 +3779,7 @@ msgstr ""
 "yang salah akan membawa pada tidak bisa digunakannya jaringan Nirkabel."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3711,7 +3788,7 @@ msgstr ""
 "Lainnya</guilabel> lalu pilih negara / wilayah Anda di sana."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3724,21 +3801,20 @@ msgstr ""
 "sebenarnya."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Metode masukan"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "input (di bagian bawah dari daftar). Metode input memungkinkan pengguna "
@@ -3751,10 +3827,11 @@ msgstr ""
 "paket."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Jika Anda melewatkan pengaturan metode input saat instalasi, Anda bisa "
@@ -4087,333 +4164,365 @@ msgstr ""
 "tombol atau lebih."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Tambah atau Modifikasi Entri Menu Boot"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
+"Untuk informasi lebih banyak tentang opsi kernel pada sistem legacy dan "
+"UEFI, lihat: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Pilihan utama Bootloader"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Anda bisa menambah atau memodifikasi entri yang Anda pilih, dengan menekan "
-"tombol yang sesuai di layar <emphasis>Konfigurasi Bootloader</emphasis> dan "
-"mengedit layar yang muncul di atasnya."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Jika Anda telah memilih <code>Grub 2</code> sebagai bootloader Anda tidak "
-"bisa menggunakan alat ini untuk mengedit daftar pada langkah ini, tekan "
-"'Berikutnya'. Anda perlu mengedit secara manual <code>/boot/grub2/custom."
-"cfg</code> atau menggunakan <code>grub-customizer</code> saja."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Beberapa hal yang bisa dilakukan tanpa resiko adalah mengubah label entri "
-"dan memilih kotak untuk membuat entri menjadi bawaan."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Anda bisa menambah nomor versi entri yang tepat, atau mengganti namanya."
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Entri bawaan adalah entri yang dipilih sistem untuk dijalankan jika Anda "
-"tidak memilih saat mulai berjalan."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr ""
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Gunakan bootloader Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Pilihan utama Bootloader"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Gunakan bootloader yang ada"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+"Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah "
+"ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus "
+"menjalankan program intalasi bootloader yang sesuai yang akan mendeteksi dan "
+"menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Jika Anda lebih suka pengaturan bootloader yang berbeda yang akan dipilih "
-"secara otomatis oleh installer, Anda bisa mengubahnya di sini."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Anda mungkin sudah memiliki sistem operasi lain pada komputer, yang mana "
-"Anda harus memilih untuk menambahkan Mageia ke bootloader yang sudah ada, "
-"atau membiarkan Mageia membuatnya."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Menu grafis Mageia sangat cantik :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Gunakan bootloader Mageia"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Bawaannya, Mageia membuat bootloader GRUB (legacy) baru ke MBR (Master Boot "
-"Record) dari harddisk pertama. Jika Anda sudah memiliki sistem operasi lain "
-"yang terinstall, Mageia akan berusaha menambahkannya ke menu boot Mageia "
-"baru."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
-"Mageia sekarang juga menawarkan GRUB2 sebagai bootloader pilihan sebagai "
-"tambahan GRUB legacy dan Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
-"Sistem Linux yang menggunakan bootloader GRUB2 tidak didukung oleh GRUB "
-"(legacy) dan tidak akan dikenali jika bootloader GRUB bawaan digunakan."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Solusi terbaik adalah menggunakan bootloader GRUB2 yang tersedia di halaman "
-"Ringkasan selama instalasi."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Gunakan bootloader yang ada"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Jika Anda memutuskan untuk menggunakan bootloader yang sudah ada maka Anda "
-"harus BERHENTI di halaman ringkasan, lalu klik tombol "
-"<guibutton>Konfigurasi</guibutton> Bootloader, yang memungkinkan Anda "
-"mengubah lokasi instalasi bootloader."
+"<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><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Layanan</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Jangan memilih perangkat seperti \"sda\", atau Anda akan menghapus MBR yang "
-"sudah ada. Anda harus memilih partisi root yang Anda pilih di bagian "
-"pemartisian sebelumnya, misalnya sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Supaya jelas, sda adalah perangkat, sda7 adalah partisi pada perangkat "
-"tersebut."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Jalankan tty2 dengan Ctrl+Alt+F2 lalu ketik <literal>df</literal> untuk "
-"memeriksa di mana partisi <literal>/</literal> (root) berada. Ctrl+Alt+F7 "
-"akan membawa Anda kembali ke layar installer."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Prosedur yang sebenarnya untuk menambahkan Mageia ke bootloader yang sudah "
-"ada diluar ruang lingkup bantuan ini, tapi dalam kebanyakan kasus akan harus "
-"menjalankan program intalasi bootloader yang sesuai yang akan mendeteksi dan "
-"menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Pilihan lanjutan bootloader"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Jika Anda memiliki ruang disk terbatas untuk partisi <literal>/</literal> "
-"yang berisi <literal>/tmp</literal>, klik pada <guibutton>Lanjutan</"
-"guibutton> lalu centang kotak <guilabel>Bersihkan /tmp setiap komputer "
-"dijalankan ulang</guilabel>. Ini akan membantu menjaga ruang kosong."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -4464,22 +4573,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX lalu akan bisa mengkonfigurasi perangkat yang tepat."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Konfigurasi Suara"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4489,7 +4599,7 @@ msgstr ""
 "Anda diberikan, yang akan jadi driver baku jika ada."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4504,7 +4614,7 @@ msgstr ""
 "guilabel> di kanan atas layar."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4516,12 +4626,12 @@ msgstr ""
 "masalah."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Lanjutan"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4532,7 +4642,7 @@ msgstr ""
 "tapi Anda pikir installer memilih yang salah."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4687,12 +4797,12 @@ msgid "Uninstalling Mageia"
 msgstr "Uninstall Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Tata cara"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4704,7 +4814,7 @@ msgstr ""
 "sistem operasi."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4716,7 +4826,7 @@ msgstr ""
 "operasi."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4735,7 +4845,7 @@ msgstr ""
 "Ruang akan dibebaskan."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4744,7 +4854,7 @@ msgstr ""
 "(FAT32 atau NTFS). Dia akan mendapatkan huruf partisi."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4796,3 +4906,275 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Akan tetapi, saat menggunakan instalasi baru, setiap pengguna yang Anda "
+#~ "tambahkan di <emphasis>MCC - Sistem - Kelola pengguna pada sistem</"
+#~ "emphasis> akan memiliki direktori home yang terproteksi pembacaan dan "
+#~ "penulisan."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Jika Anda tidak ingin direktori home bisa dibaca semua orang, disarankan "
+#~ "untuk sekarang hanya menambahkan pengguna sementara dan menambahkan yang "
+#~ "sebenarnya setelah menyalakan ulang komputer."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Kedua arsitektur tersedia dalam media yang sama, pilihan dibuat otomatis "
+#~ "berdasarkan CPU yang terdeteksi."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Hanya menggunakan desktop Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Tidak semua bahasa tersedia. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, "
+#~ "ru, sv, uk) UNTUK DIPILIH!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Ini berisi perangkat lunak non free."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Hanya 32 bit."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ 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."
+#~ msgstr ""
+#~ "Anda bisa menambah atau memodifikasi entri yang Anda pilih, dengan "
+#~ "menekan tombol yang sesuai di layar <emphasis>Konfigurasi Bootloader</"
+#~ "emphasis> dan mengedit layar yang muncul di atasnya."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Jika Anda telah memilih <code>Grub 2</code> sebagai bootloader Anda tidak "
+#~ "bisa menggunakan alat ini untuk mengedit daftar pada langkah ini, tekan "
+#~ "'Berikutnya'. Anda perlu mengedit secara manual <code>/boot/grub2/custom."
+#~ "cfg</code> atau menggunakan <code>grub-customizer</code> saja."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Beberapa hal yang bisa dilakukan tanpa resiko adalah mengubah label entri "
+#~ "dan memilih kotak untuk membuat entri menjadi bawaan."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Anda bisa menambah nomor versi entri yang tepat, atau mengganti namanya."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Entri bawaan adalah entri yang dipilih sistem untuk dijalankan jika Anda "
+#~ "tidak memilih saat mulai berjalan."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Jika Anda lebih suka pengaturan bootloader yang berbeda yang akan dipilih "
+#~ "secara otomatis oleh installer, Anda bisa mengubahnya di sini."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Anda mungkin sudah memiliki sistem operasi lain pada komputer, yang mana "
+#~ "Anda harus memilih untuk menambahkan Mageia ke bootloader yang sudah ada, "
+#~ "atau membiarkan Mageia membuatnya."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Bawaannya, Mageia membuat bootloader GRUB (legacy) baru ke MBR (Master "
+#~ "Boot Record) dari harddisk pertama. Jika Anda sudah memiliki sistem "
+#~ "operasi lain yang terinstall, Mageia akan berusaha menambahkannya ke menu "
+#~ "boot Mageia baru."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia sekarang juga menawarkan GRUB2 sebagai bootloader pilihan sebagai "
+#~ "tambahan GRUB legacy dan Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Sistem Linux yang menggunakan bootloader GRUB2 tidak didukung oleh GRUB "
+#~ "(legacy) dan tidak akan dikenali jika bootloader GRUB bawaan digunakan."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Solusi terbaik adalah menggunakan bootloader GRUB2 yang tersedia di "
+#~ "halaman Ringkasan selama instalasi."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Jika Anda memutuskan untuk menggunakan bootloader yang sudah ada maka "
+#~ "Anda harus BERHENTI di halaman ringkasan, lalu klik tombol "
+#~ "<guibutton>Konfigurasi</guibutton> Bootloader, yang memungkinkan Anda "
+#~ "mengubah lokasi instalasi bootloader."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Jangan memilih perangkat seperti \"sda\", atau Anda akan menghapus MBR "
+#~ "yang sudah ada. Anda harus memilih partisi root yang Anda pilih di bagian "
+#~ "pemartisian sebelumnya, misalnya sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Supaya jelas, sda adalah perangkat, sda7 adalah partisi pada perangkat "
+#~ "tersebut."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Jalankan tty2 dengan Ctrl+Alt+F2 lalu ketik <literal>df</literal> untuk "
+#~ "memeriksa di mana partisi <literal>/</literal> (root) berada. Ctrl+Alt+F7 "
+#~ "akan membawa Anda kembali ke layar installer."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Pilihan lanjutan bootloader"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Jika Anda memiliki ruang disk terbatas untuk partisi <literal>/</literal> "
+#~ "yang berisi <literal>/tmp</literal>, klik pada <guibutton>Lanjutan</"
+#~ "guibutton> lalu centang kotak <guilabel>Bersihkan /tmp setiap komputer "
+#~ "dijalankan ulang</guilabel>. Ini akan membantu menjaga ruang kosong."
diff --git a/docs/installer/it.po b/docs/installer/it.po
index 401ab25d..f966ebef 100644
--- a/docs/installer/it.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:45+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -178,35 +178,27 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestione dell'utente e del superuser"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -219,7 +211,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -229,12 +221,12 @@ msgstr ""
 "e altri caratteri."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Inserisci un utente"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -242,7 +234,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -251,7 +243,7 @@ msgstr ""
 "utente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -260,7 +252,7 @@ msgstr ""
 "spazio."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -268,7 +260,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -276,7 +268,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -284,60 +276,45 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
-msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:80
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all 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:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Gestione Avanzata Utenti"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -345,7 +322,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -357,7 +334,7 @@ msgstr ""
 "rispetto a un utente normale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -365,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -376,7 +353,7 @@ msgstr ""
 "vuoto nel caso in cui tu non sappia cosa fare."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -687,19 +664,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Selezione Desktop"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "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:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -707,16 +684,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -728,22 +706,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Selezione per gruppi di pacchetti"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -752,32 +731,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Stazione di lavoro."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Ambiente grafico."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1189,20 +1168,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partizionamento personalizzato con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1215,7 +1198,7 @@ msgstr ""
 "literal> NON deve essere impostata, altrimenti il sistema non sarà avviabile."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1223,7 +1206,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1233,7 +1216,7 @@ msgstr ""
 "sono tre."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1242,7 +1225,7 @@ msgstr ""
 "partizioni sul dispositivo di storage selezionato."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1252,40 +1235,69 @@ msgstr ""
 "oppure cancellala."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continua sino a quando non avrai impostato tutto come desideri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1293,28 +1305,39 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
+"</imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
 "\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Utilizza le partizioni esistenti"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1323,12 +1346,12 @@ msgstr ""
 "Linux compatibili e potrebbero essere usate per l'installazione."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Utilizza lo spazio libero"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1337,12 +1360,12 @@ msgstr ""
 "per la tua nuova installazione di Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1351,7 +1374,7 @@ msgstr ""
 "l'installer potrebbe offrirti di utilizzarla."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 +1382,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 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,7 +1393,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1379,31 +1402,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Formatta e utilizza tutto il disco"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Questa opzione userà l'intero disco per Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1411,67 +1444,67 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 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:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1479,8 +1512,48 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1492,17 +1565,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1612,27 +1685,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Complimenti"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1640,7 +1710,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1649,7 +1719,7 @@ msgstr ""
 "diversi sistemi operativi del tuo computer (se ne possiedi più di uno)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1658,12 +1728,12 @@ msgstr ""
 "Mageia verrà automaticamente selezionata e avviata."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Divertiti!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1785,6 +1855,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2341,30 +2416,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Sommario di vari parametri"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2376,18 +2437,40 @@ msgstr ""
 "controllare le impostazioni e cambiarle se lo desideri premendo "
 "<guibutton>Configura</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parametri del sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fuso orario</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2398,12 +2481,12 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Paese / Regione</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2412,35 +2495,35 @@ msgstr ""
 "impostazioni. Guarda <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Bootloader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestione dell'utente</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2449,12 +2532,12 @@ msgstr ""
 "<literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servizi</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2464,7 +2547,7 @@ msgstr ""
 "task."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2473,47 +2556,54 @@ msgstr ""
 "potrebbe impedire al tuo computer di lavorare correttamente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Parametri dell'hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastiera</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr ""
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mouse</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Scheda audio</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2521,42 +2611,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfaccia grafica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Parametri di rete e di Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rete</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2568,19 +2660,19 @@ msgstr ""
 "Center</application> se non hai abilitato i repository Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2591,7 +2683,7 @@ msgstr ""
 "per utilizzare un servizio proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2600,17 +2692,17 @@ msgstr ""
 "ottenere i parametri che necessiti inserire qua"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Sicurezza"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Livello di sicurezza</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2620,17 +2712,17 @@ msgstr ""
 "un uso generale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -2639,10 +2731,12 @@ msgstr ""
 "mascalzoni in internet che potrebbero comprometterli o rubarli."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Seleziona i servizi che desideri abbiano accesso al tuo sistema. Le tue "
 "selezioni dipendono dall'uso che fai del tuo computer."
@@ -2653,25 +2747,43 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Riavvia"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
@@ -2733,29 +2845,29 @@ msgstr ""
 "Center."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Seleziona e utilizza dei file ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introduzione"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2764,7 +2876,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2772,22 +2884,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definizione"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2795,7 +2907,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -2804,23 +2916,23 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Media di installazione classico"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Funzioni comuni"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -2828,17 +2940,17 @@ msgstr ""
 "precedente."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Media diversi per le architetture a 32 o 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -2847,58 +2959,25 @@ msgstr ""
 "Sistema, Test della Memoria, Strumento di Identificazione Hardware."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Ti sarà data la possibilità, durante l'installazione, di aggiungere software "
 "non free."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Entrambe le architetture sono presenti sul media, la scelta verrà fatta in "
-"automatico in base alla CPU identificata."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Usa solo Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Non tutte le lingue sono disponibili. (be, bg, ca, de, en, es, fr, it, mk, "
-"pl, pt, ru, sv, uk) DA ESSERE CONTROLLATE."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Contiene del software non libero"
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Media live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -2907,18 +2986,20 @@ msgstr ""
 "installarla su di un HDD avendo comunque la possibilità di farlo."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, 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:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -2929,63 +3010,57 @@ msgstr ""
 "precedente release.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Contengono del software non libero."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "CD Live con KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "DVD Live con KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Solamente l'ambiente KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Solamente la lingua inglese."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "solo 32 bit."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Sono presenti tutte le lingue."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "CD Live con GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "DVD Live con GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Solamente l'ambiente GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "DVD Live con KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Sono presenti tutte le lingue."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "DVD Live con GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Solamente l'ambiente KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Boot-only CD media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -2999,7 +3074,7 @@ msgstr ""
 "network locale o su internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3009,13 +3084,18 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Solamente la lingua inglese."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3024,12 +3104,13 @@ msgstr ""
 "software proprietario."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3038,17 +3119,17 @@ msgstr ""
 "persone che ne hanno bisogno."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Scaricando e controllando il media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Download in corso"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3061,12 +3142,12 @@ msgstr ""
 "bassa. Se è stato scelto http potreste inoltre vedere qualcosa come"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3074,22 +3155,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Controllando l'integrità del media scaricato."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3099,12 +3180,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3113,7 +3194,7 @@ msgstr ""
 "image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3122,7 +3203,7 @@ msgstr ""
 "the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3131,17 +3212,17 @@ msgstr ""
 "attendere un poco) a quello dato da Mageia. Per esempio:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Masterizza o esegui un dump dell'ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3151,12 +3232,12 @@ msgstr ""
 "creare un media avviabile."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3170,12 +3251,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">wiki di Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3184,7 +3265,7 @@ msgstr ""
 "una chiavetta USB e usarle per avviare e installare il sistema."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3195,19 +3276,19 @@ msgstr ""
 "partizione ridotta alla grandezza dell'immagine del disco."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3216,24 +3297,24 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Potresti provare:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3242,29 +3323,29 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Apri una console"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3273,12 +3354,12 @@ msgstr ""
 "'-' finale)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3287,17 +3368,17 @@ 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:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3305,7 +3386,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3329,14 +3410,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3345,12 +3426,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Dove X = nome del tuo dispositivo esempio: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3359,43 +3440,42 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Togli la tua chiavetta USB, hai concluso"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Seleziona il tuo paese/regione"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3404,7 +3484,7 @@ msgstr ""
 "guilabel> e seleziona il tuo Stato / Regione."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3417,28 +3497,26 @@ msgstr ""
 "scelta reale."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Metodo di input"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3744,284 +3822,353 @@ msgstr ""
 "pulsanti."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Aggiungi o modifica una Boot Menu Entry"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
-#. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
+"Per maggiori informazioni riguardo le opzioni del kernel su sistemi legacy e "
+"UEFI visitare: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Opzioni principali del bootloader"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Opzioni principali del bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
-msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
-msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+msgid ""
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Opzioni principali del bootloader"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Usare un bootloader esistente"
+
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Se preferisci impostazioni del bootloader diverse da quelle scelte in "
-"automatico dall'installer puoi modificare da qua."
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Potresti già avere altri sistemi su questa macchina. In tal caso puoi "
-"decidere se aggiungere Mageia al tuo bootloader esistente o permettere a "
-"Mageia di crearne uno nuovo."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia adesso offre GRUB2 come bootloader opzionale oltre a GRUB legacy e "
-"Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"La migliore soluzione è utilizzare GRUB 2 che è disponibile durante "
-"l'installazione."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Usare un bootloader esistente"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Servizi</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
-msgstr ""
-
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Per essere chiari, sda è il dispositivo, sda7 la partizione su quel "
-"dispositivo."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Opzioni avanzate del Bootloader"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -4073,22 +4220,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX dovrebbe essere in grado di configurare il drive correttamente."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Configurazione audio"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4096,7 +4244,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4106,7 +4254,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4114,12 +4262,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avanzato"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4127,7 +4275,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4276,12 +4424,12 @@ msgid "Uninstalling Mageia"
 msgstr "Disinstallare Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Come fare"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4293,7 +4441,7 @@ msgstr ""
 "accade per ogni sistema operativo."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4305,7 +4453,7 @@ msgstr ""
 "sistema operativo."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4317,14 +4465,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4369,3 +4517,108 @@ 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 ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Entrambe le architetture sono presenti sul media, la scelta verrà fatta "
+#~ "in automatico in base alla CPU identificata."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Usa solo Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Non tutte le lingue sono disponibili. (be, bg, ca, de, en, es, fr, it, "
+#~ "mk, pl, pt, ru, sv, uk) DA ESSERE CONTROLLATE."
+
+#~ msgid "It contains non free software."
+#~ msgstr "Contiene del software non libero"
+
+#~ msgid "Live CD KDE"
+#~ msgstr "CD Live con KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "solo 32 bit."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "CD Live con GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Se preferisci impostazioni del bootloader diverse da quelle scelte in "
+#~ "automatico dall'installer puoi modificare da qua."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Potresti già avere altri sistemi su questa macchina. In tal caso puoi "
+#~ "decidere se aggiungere Mageia al tuo bootloader esistente o permettere a "
+#~ "Mageia di crearne uno nuovo."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia adesso offre GRUB2 come bootloader opzionale oltre a GRUB legacy e "
+#~ "Lilo."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "La migliore soluzione è utilizzare GRUB 2 che è disponibile durante "
+#~ "l'installazione."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Per essere chiari, sda è il dispositivo, sda7 la partizione su quel "
+#~ "dispositivo."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Opzioni avanzate del Bootloader"
diff --git a/docs/installer/ja.po b/docs/installer/ja.po
index d4244b61..fb4dfcba 100644
--- a/docs/installer/ja.po
+++ b/docs/installer/ja.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:51+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -158,26 +158,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr ""
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -185,12 +174,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -203,19 +192,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "ユーザ名を入力"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -223,21 +212,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -245,7 +234,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -253,7 +242,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -261,59 +250,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
-msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:80
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all 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:115
+#: en/addUser.xml:87
 msgid "The access permissions can also be changed after the install."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -321,7 +295,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -329,7 +303,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -337,7 +311,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -345,7 +319,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -655,19 +629,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "デスクトップの選択"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "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:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -675,16 +649,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -696,22 +671,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "パッケージグループを選択"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -720,32 +696,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1138,23 +1114,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1163,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1171,62 +1148,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1234,59 +1241,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 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:44
+#: en/doPartitionDisks.xml:52
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
 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:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1294,7 +1312,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1305,7 +1323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1314,7 +1332,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1322,23 +1340,33 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1346,67 +1374,67 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "カスタム"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 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:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1414,8 +1442,48 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1427,17 +1495,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1536,27 +1604,24 @@ msgid "Mageia 4"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "おめでとうございます"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1564,26 +1629,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1696,6 +1761,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2229,30 +2299,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2260,18 +2316,40 @@ msgid ""
 "<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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2279,110 +2357,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, 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:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+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:75
+#: en/misc-params.xml:69
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 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:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 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:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr ""
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2390,41 +2474,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2433,19 +2519,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>プロキシ</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2453,51 +2539,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "セキュリティ"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2506,28 +2593,44 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "再起動"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -2580,29 +2683,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "序文"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2611,7 +2714,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2619,22 +2722,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2642,116 +2745,88 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr ""
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -2759,63 +2834,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -2824,49 +2889,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr ""
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -2875,12 +2945,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -2888,22 +2958,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -2913,55 +2983,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -2970,19 +3040,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -2990,101 +3060,101 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3092,7 +3162,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3116,76 +3186,75 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3194,28 +3263,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3480,286 +3547,352 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "ブートローダのメインオプション"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "ブートローダのメインオプション"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "ブートローダのメインオプション"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr ""
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>プロキシ</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -3805,22 +3938,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "サウンドの設定"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -3828,7 +3962,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -3838,7 +3972,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -3846,12 +3980,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "詳細"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -3859,7 +3993,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4012,12 +4146,12 @@ msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4025,7 +4159,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4033,7 +4167,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4045,14 +4179,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4099,3 +4233,84 @@ 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 ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index f6af273d..a37dcafd 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-08-07 12:35+0000\n"
 "Last-Translator: Dennis Holierhoek <dennis.hh@hotmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -187,26 +187,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gebruikersbeheer"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -214,12 +203,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Beheerderswachtwoord (root)  instellen:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -240,7 +229,7 @@ msgstr ""
 "sluiten."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -250,12 +239,12 @@ msgstr ""
 "en andere tekens."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Voer een gebruiker in"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -267,7 +256,7 @@ msgstr ""
 "normaal mens zijn computer voor gebruikt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -275,7 +264,7 @@ msgstr ""
 "<guibutton>Pictogram</guibutton>: klik op het pictogram om het te veranderen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -284,7 +273,7 @@ msgstr ""
 "gebruiker in."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -295,7 +284,7 @@ msgstr ""
 "volledige naam. <emphasis>De aanmeldnaam is hoofdlettergevoelig.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -306,7 +295,7 @@ msgstr ""
 "wachtwoord weergeeft. (Zie ook  <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -316,42 +305,23 @@ msgstr ""
 "in dit tekstvak en DrakX zal controleren of beide wachtwoorden gelijk zijn."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Van elke gebruiker die u toevoegt tijdens het installeren van Mageia, zal de "
 "homedirectory door iedereen gelezen kunnen worden (zonder er in te kunnen "
 "schrijven)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Echter, terwijl u uw nieuwe installatie gebruikt zal elke gebruiker die u in "
-"<emphasis>MCC - Systeem - Gebruikers op het systeem beheren</emphasis> "
-"toevoegt, een homedirectory hebben die tegen lezen en schrijven beschermd is."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Als u voor niemand een homedirectory wilt die door iedereen gelezen kan "
-"worden, wordt aangeraden nu alleen een tijdelijke gebruiker toe te voegen en "
-"de echte pas na het herstarten van uw computer."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Als u graag wilt dat iedereen de homedirectory's kan lezen, dan kunt u alle "
 "extra benodigde gebruikers toevoegen in de <emphasis>Configuratie - "
@@ -359,17 +329,17 @@ msgstr ""
 "<emphasis>Gebruikersbeheer</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Geavanceerd gebruikersbeheer"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -379,12 +349,12 @@ msgstr ""
 "wordt."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -395,7 +365,7 @@ msgstr ""
 "belangrijke gegevens kan hij het beste op een USB pen zetten."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -407,7 +377,7 @@ msgstr ""
 "gebruiker."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -418,7 +388,7 @@ msgstr ""
 "wordt. De mogelijkheden zijn Bash, Dash and Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -429,7 +399,7 @@ msgstr ""
 "dit vak leeg, tenzij u weet wat u doet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -808,12 +778,12 @@ msgstr ""
 "\">extra stappen in live-modus</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Werkomgevingselectie"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -822,7 +792,7 @@ msgstr ""
 "uw keuze te verfijnen."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -833,16 +803,17 @@ msgstr ""
 "geïnstalleerd worden, door op <guilabel>Details</guilabel> te klikken."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -862,22 +833,23 @@ msgstr ""
 "de twee eerder genoemde."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Pakketgroepselectie"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -890,22 +862,22 @@ msgstr ""
 "beweegt."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Werkstation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafische omgeving."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -914,10 +886,11 @@ msgstr ""
 "pakketten toe te voegen."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref> voor instructies over hoe een "
 "minimale installatie (zonder of met X &amp; IceWM) te doen."
@@ -1402,23 +1375,24 @@ msgstr ""
 "te zijn met uw keuze."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Aangepaste schijfpartitionering met DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1431,7 +1405,7 @@ msgstr ""
 "uw systeem niet opstarten."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1442,7 +1416,7 @@ msgstr ""
 "partitie wijzigen en zelfs bekijken wat ze bevatten voor u start."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1452,7 +1426,7 @@ msgstr ""
 "als er drie zijn."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1461,7 +1435,7 @@ msgstr ""
 "geselecteerde opslag apparaat te verwijderen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1471,43 +1445,77 @@ msgstr ""
 "aan of verwijder haar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Ga verder totdat alles naar uw wensen is aangepast."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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-"
 "SysteemPartitie) beschikbaar is en aangekoppeld op /boot/EFI (zie boven)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Als u Mageia op een UEFI-systeem installeert, zorg dan dat een ESP (EFI-"
+"SysteemPartitie) beschikbaar is en aangekoppeld op /boot/EFI (zie boven)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1518,7 +1526,7 @@ msgstr ""
 "<application>Mageia</application> te installeren."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1527,21 +1535,32 @@ msgstr ""
 "van de indeling en de inhoud van uw specifieke harde schijf (schijven)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Huidige partities gebruiken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1550,12 +1569,12 @@ msgstr ""
 "gevonden die gebruikt kunnen worden voor het installeren."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Vrije ruimte gebruiken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1564,12 +1583,12 @@ msgstr ""
 "Mageia-installatie wilt gebruiken, kies dan deze optie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1578,7 +1597,7 @@ msgstr ""
 "gebruiken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 +1608,7 @@ msgstr ""
 "van al uw belangrijke bestanden een reservekopie heeft!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1607,7 +1626,7 @@ msgstr ""
 "uw persoonlijke bestanden te maken op een andere schijf of lokatie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1620,7 +1639,7 @@ msgstr ""
 "links of rechts te slepen. Zie de schermafbeelding hieronder."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1628,25 +1647,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Volledige harde schijf wissen en gebruiken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1657,12 +1686,12 @@ msgstr ""
 "verliezen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Aangepaste schijfpartitionering"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1671,12 +1700,12 @@ msgstr ""
 "uw harde schijf of schijven."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitiegroottes:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1685,7 +1714,7 @@ msgstr ""
 "de beschikbare ruimte volgens onderstaande regels gebruikt worden:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1694,30 +1723,30 @@ msgstr ""
 "partitie aangemaakt, voor /, er is geen aparte partitie  voor /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 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:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "de rest (minimaal 12/19e) gaat naar /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1726,7 +1755,7 @@ msgstr ""
 "gemaakt worden: 50 GB /, 4 GB swap en alle overige ruimte gaat naar /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1738,8 +1767,48 @@ msgstr ""
 "bestaat, en gekoppeld op /boot/EFI. De optie \"Aangepast\" in de enige "
 "waarmee kan worden gecontroleerd of het juist gedaan is"
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1758,17 +1827,17 @@ msgstr ""
 "gparted, te partitioneren en de volgende instellingen te gebruiken:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Uitlijnen met\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Vrije ruimte links (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1882,27 +1951,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1913,7 +1979,7 @@ msgstr ""
 "verwijderen en uw computer herstarten."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1922,7 +1988,7 @@ msgstr ""
 "besturingssystemen op uw computer (als u er meer dan één heeft)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1931,12 +1997,12 @@ msgstr ""
 "Mageia automatisch geselecteerd en gestart."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Veel plezier!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2071,6 +2137,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2731,30 +2802,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Overzicht van diverse instellingen"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2766,18 +2823,40 @@ msgstr ""
 "instellingen hier controleren en in indien gewenst veranderen door eerst op "
 "<guibutton>Configureren</guibutton> te klikken."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Systeeminstellingen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Tijdzone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2787,12 +2866,12 @@ msgstr ""
 "linkend=\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2801,35 +2880,35 @@ msgstr ""
 "u deze instelling verandert. Zie <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Opstartlader</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr ""
 "Verander niets, tenzij u weet hoe u GRUB en/of Lilo dient in te stellen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gebruikersbeheer</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2838,12 +2917,12 @@ msgstr ""
 "literal> mappen krijgen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Diensten</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2852,7 +2931,7 @@ msgstr ""
 "(daemons). Hier kunt u bepaalde daemons activeren of deactiveren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2861,22 +2940,22 @@ msgstr ""
 "uw computer goed werkt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Apparatuurinstellingen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Toetsenbord</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2885,13 +2964,20 @@ msgstr ""
 "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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Muis</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2900,12 +2986,12 @@ msgstr ""
 "trackballs and touchpads."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Geluidskaart</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2917,42 +3003,44 @@ msgstr ""
 "standaardstuurprogramma is."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafische interface</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Netwerk en internetinstellingen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Netwerk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2965,7 +3053,7 @@ msgstr ""
 "configuratiecentrum</application> (MCC)."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2974,12 +3062,12 @@ msgstr ""
 "stellen dat hij deze interface ook bewaakt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2990,7 +3078,7 @@ msgstr ""
 "een proxy service gebruikt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2999,17 +3087,17 @@ msgstr ""
 "moet invullen."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Beveiliging"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Beveiligingsniveau</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3018,17 +3106,17 @@ msgstr ""
 "is de standaardinstelling (Standaard) geschikt voor algemeen gebruik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3037,10 +3125,12 @@ msgstr ""
 "boeven daarbuiten op internet die ze zouden willen aantasten of stelen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Selecteer de diensten die toegang tot uw systeem mogen hebben. Uw selectie "
 "hangt af van waar u uw computer voor gebruikt."
@@ -3051,26 +3141,39 @@ 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."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Herstarten"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Als de bootloader (opstartlader) eenmaal is geïnstalleerd, wordt u gevraagd "
+"om uw computer te \"halten\" (stoppen), de live-cd te verwijderen en de "
+"computer te herstarten. Als u herstart, zult u meerdere "
+"downloadvoortgangsbalken zien die elkaar opvolgen. Dit geeft aan dat de "
+"softwaremedia worden gedownload (zie Softwarebeheer)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Als de bootloader (opstartlader) eenmaal is geïnstalleerd, wordt u gevraagd "
 "om uw computer te \"halten\" (stoppen), de live-cd te verwijderen en de "
@@ -3078,6 +3181,16 @@ msgstr ""
 "downloadvoortgangsbalken zien die elkaar opvolgen. Dit geeft aan dat de "
 "softwaremedia worden gedownload (zie Softwarebeheer)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3140,17 +3253,17 @@ msgstr ""
 "configuratiecentrum (MCC)."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Selecteer en gebruik ISO's"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introductie"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3159,12 +3272,12 @@ msgstr ""
 "helpen bij het kiezen van een afbeelding die aan uw wensen voldoet."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Er zijn twee mediafamilies:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3178,7 +3291,7 @@ msgstr ""
 "installeren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3190,22 +3303,22 @@ msgstr ""
 "minder keuzes."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definitie"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3216,7 +3329,7 @@ msgstr ""
 "ISO-bestand op gekopieerd is."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3225,23 +3338,23 @@ msgstr ""
 "vinden."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klassieke installatiemedia"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Algemene eigenschappen"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3249,17 +3362,17 @@ msgstr ""
 "actualiseren."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "dvd"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Verschillende media voor 32- en 64-bits architectuur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3268,58 +3381,25 @@ msgstr ""
 "Test, Hardware Detection Tool."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "U zult tijdens de installatie de keuze krijgen om nonfree software toe te "
 "voegen."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "Dual arch DVD"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Beide architecturen zijn beschikbaar op hetzelfde medium, de keuze wordt "
-"automatisch gemaakt overeenkomstig de gedetecteerde CPU."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Enkel XFCE-werkomgeving"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Niet alle talen zijn beschikbaar. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) NOG CHECKEN!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Het bevat niet-vrije software."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3328,18 +3408,20 @@ msgstr ""
 "schijf te installeren. Indien gewenst is installeren wel mogelijk."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Elke ISO bevat slechts één werkomgeving (KDE of GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3350,63 +3432,57 @@ msgstr ""
 "mee bij te werken.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Ze bevatten niet-vrije software."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "KDE Live CD"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "KDE Live DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Enkel KDE-werkomgeving."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Enkel de Engelse taal."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Enkel 32 bits"
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Alle talen zijn aanwezig."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "GNOME Live CD"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "GNOME Live DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Enkel GNOME werkomgeving."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "KDE Live DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Alle talen zijn aanwezig."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "GNOME Live DVD"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Enkel KDE-werkomgeving."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Enkel-opstart CD-media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3420,7 +3496,7 @@ msgstr ""
 "station, lokaal netwerk of op internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3430,13 +3506,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Enkel de Engelse taal."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Start de installatie"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3445,12 +3527,13 @@ msgstr ""
 "gebruiken."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3459,17 +3542,17 @@ msgstr ""
 "nodig hebben."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Een medium downloaden en checken"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Downloaden"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3482,12 +3565,12 @@ msgstr ""
 "laag is. Als http werd gekozen, kun u ook iets zien zoals:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3498,22 +3581,22 @@ msgstr ""
 "\"integrity\">voor verder gebruik</link>. Dan verschijnt er dit venster:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Vink het selectierondje 'Bestand opslaan' aan."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "De integriteit van het gedownloade ISO controleren"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3528,12 +3611,12 @@ msgstr ""
 "overdoen."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3542,7 +3625,7 @@ msgstr ""
 "het/image/bestand.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3551,7 +3634,7 @@ msgstr ""
 "het/image/bestand.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3560,17 +3643,17 @@ msgstr ""
 "voor het verschijnt) met het getal dat door Mageia gegeven werd. Voorbeeld:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Brand of dump het ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3580,12 +3663,12 @@ msgstr ""
 "zorgt wel dat een opstartbaar medium gemaakt wordt."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3599,12 +3682,12 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3613,7 +3696,7 @@ msgstr ""
 "'dumpen' en dan van die USB-stick op kunt starten en installeren."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3624,7 +3707,7 @@ msgstr ""
 "capaciteit zal worden gereduceerd tot de grootte van het beeldbestand."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3633,12 +3716,12 @@ msgstr ""
 "partitioneren en formatteren."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3647,17 +3730,17 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Probeer bijv.:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3666,7 +3749,7 @@ msgstr ""
 "\"ISO-image\"-optie;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3675,12 +3758,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3689,17 +3772,17 @@ msgstr ""
 "overschrijven van een schijfpartitie als je het apparaat-ID verkeerd krijgt."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Open een terminal"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3708,12 +3791,12 @@ msgstr ""
 "het eind niet)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3722,17 +3805,17 @@ msgstr ""
 "bestandsmanager openen die hem zou kunnen bekijken of lezen)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3743,7 +3826,7 @@ msgstr ""
 "<emphasis>sdd</emphasis> als volgt zien:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3785,7 +3868,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3794,7 +3877,7 @@ msgstr ""
 "code> in bovenstaande schermafbeelding. Het is een 8GB USB-stick."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3803,12 +3886,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Waar X=apparaatnaam, bijv: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3817,37 +3900,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Verwijder uw USB-stick, hij is gereed"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Selecteer uw land"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3856,7 +3939,7 @@ msgstr ""
 "instellen kan veroorzaken dat u geen draadloos netwerk kunt gebruiken."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3865,7 +3948,7 @@ msgstr ""
 "guilabel> knop en kies uw land daar."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3878,21 +3961,20 @@ msgstr ""
 "volgen."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Invoermethode"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "invoermethode selecteren (onderaan de lijst). Met invoermethodes kunnen "
@@ -3905,10 +3987,11 @@ msgstr ""
 "media toevoegt voor u de pakketten selecteert."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Als u het instellen van de invoermethode miste tijdens het installeren, kunt "
@@ -4245,355 +4328,378 @@ msgstr ""
 "of meer knoppen."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Voor meer informatie over kernelopties in legacy- en UEFI-sytemen, zie: "
+"<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><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Algemene opties voor de opstartlader"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Met een BIOS-systeem"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Algemene opties voor de opstartlader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"U kunt een ingang (in het scherm \"waarde\" genoemd) toevoegen of er een "
-"selecteren om aan te passen. Klik op de betreffende knop in het "
-"<emphasis>Configuratie van Opstartlader</emphasis> scherm en bewerk de "
-"gegevens in het scherm dat zich op de voorgrond opent."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Als u <code>Grub 2</code> als opstartlader heeft gekozen kunt u deze tool "
-"niet gebruiken om ingangen aan te passen. Klik op 'Volgende'. U kunt wel "
-"handmatig <code>/boot/grub2/custom.cfg</code> bewerken, of de tool "
-"<code>grub-customizer</code> gebruiken."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Met een UEFI-systeem"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr "Wijzig het \"Opstartapparaat\" niet, tenzij u weet wat u doet."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Met een UEFI-systeem"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Een paar dingen die zonder enig risico gedaan kunnen worden, zijn de naam "
-"van een menu-ingang veranderen en het hokje aanvinken waarmee een waarde de "
-"standaard ingang wordt."
+"Bij een UEFI-systeem is de gebruikersinterface iets anders: u kunt u geen "
+"opstartlader kiezen, omdat enkel Grub2-efi beschikbaar is."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"U kunt het juiste versienummer van een ingang toevoegen of deze helemaal "
-"hernoemen."
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"De Standaard waarde of ingang, is die die gestart wordt als u geen keuze "
-"maakt tijdens het opstarten van uw computer."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Door andere dingen te veranderen kan het gebeuren dat u uw systeem niet meer "
-"kunt opstarten. Probeer alstublieft niets zonder precies te weten wat u doet."
+"Als uw computer nog geen besturingssysteem had, dan maakte het Mageia-"
+"installatieprogramma een ESP (EFI-SysteemPartitie) voor de opstartlader "
+"(Grub2-efi). Stond er echter al eerder een UEFI-besturingssysteem op (bijv. "
+"Windows 8), dan detecteert Mageia de bestaande ESP die door Windows werd "
+"gecreëerd en wordt de grub2-efi-opstartlader daar ingevoegd. Alhoewel het "
+"mogelijk is verscheidene ESP's te hebben, wordt aanbevolen het bij één te "
+"laten. Één is genoeg, ongeacht het aantal besturingssystemen dat u heeft."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Met een UEFI-systeem"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "De Mageia-opstartlader gebruiken"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"In dit geval gebruikt u Grub2-efi en kunt u deze tool niet gebruiken om "
-"ingangen aan te passen. Dat kan wel door <code>/boot/grub2/custom.cfg</code> "
-"te bewerken of de tool <code>grub-customizer</code> gebruiken. Het enige dat "
-"u hier kunt doen is de standaard ingang kiezen in de uitvouwlijst."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Nadat u op <guibutton>Volgende</guibutton> heeft geklikt, volgt er nog een "
-"lijst waarmee u de beeldresolutie voor Grub2, een grafische opstartlader, "
-"kunt kiezen."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Algemene opties voor de opstartlader"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Een bestaande opstartlader gebruiken"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+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 "
+"het nodig het installatieprogramma van de betreffende opstartlader te "
+"gebruiken, dat Mageia automatisch zou moeten zien en toevoegen. Raadpleeg de "
+"documentatie van het betreffende besturingssysteem."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
+msgid ""
+"If you don't want a bootable Mageia, but 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>."
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Als u liever andere opstartladerinstellingen heeft dan DrakX koos, kunt u ze "
-"hier veranderen."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Misschien heeft u al een ander besturingssysteem op uw machine, in dat geval "
-"moet u besluiten of u Mageia aan uw bestaande opstartlader wilt toevoegen, "
-"of dat u Mageia toestaat een nieuwe te creëren."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "De Mageia grafische menu's zijn mooi :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "De Mageia-opstartlader gebruiken"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
-"Standaard schrijft Mageia een nieuwe GRUB-(legacy-)opstartlader in de MBR "
-"(Master Boot Record) van uw eerste harde schijf. Als u al andere "
-"besturingssystemen heeft, probeert Mageia ze aan uw nieuwe Mageia "
-"opstartmenu toe te voegen."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Mageia biedt nu, naast de mogelijkheid om GRUB legacy of Lilo als "
-"opstartlader te nemen, ook GRUB2 als keuze aan."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Linux systemen die de GRUB2 opstartlader gebruiken worden nog niet door "
-"GRUB(-legacy) ondersteund en zullen niet herkend worden als de standaard "
-"GRUB opstartlader gebruikt wordt."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"De beste oplossing hiervoor is de GRUB2 opstartlader te gebruiken, die "
-"tijdens het installeren in de Overzichtspagina beschikbaar is."
+"<guilabel>Wachtwoord (nogmaals)</guilabel>: Herhaal het gebruikerswachtwoord "
+"in dit tekstvak en DrakX zal controleren of beide wachtwoorden gelijk zijn."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Een bestaande opstartlader gebruiken"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Diensten</guilabel>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Als u besluit een bestaande opstartlader te gebruiken, moet u er tijdens de "
-"installatie aan denken te STOPPEN in de overzichtspagina en op de "
-"Opstartlader <guibutton>Configureren</guibutton> knop te klikken, waarna u "
-"de locatie kunt veranderen waar de opstartlader geplaatst wordt."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Kies geen apparaat zoals \"sda\", anders overschrijft u uw bestaande MBR. U "
-"moet de root partitie selecteren die u eerder tijdens de installatie koos, "
-"bijvoorbeeld \"sda7\"."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Ter verduidelijking, sda is een apparaat, sda7 is een partitie."
-
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Ga naar tty2 met Ctrl+Alt+F2 en type <literal>df</literal> om te controleren "
-"waar uw <literal>/</literal> (root) partitie is. Ctrl+Alt+F7 brengt u terug "
-"naar het installatiescherm."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"het nodig het installatieprogramma van de betreffende opstartlader te "
-"gebruiken, dat Mageia automatisch zou moeten zien en toevoegen. Raadpleeg de "
-"documentatie van het betreffende besturingssysteem."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Geavanceerde optie voor de opstartlader"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Als u zeer weinig schijfruimte heeft voor de <literal>/</literal> partitie "
-"met <literal>/tmp</literal>, klik dan op <guibutton>Geavanceerd</guibutton> "
-"en zet een vinkje voor <guilabel>Elke keer bij opstarten /tmp legen</"
-"guilabel>. Dit helpt om wat vrije ruimte te behouden."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Bij een UEFI-systeem is de gebruikersinterface iets anders: u kunt u geen "
-"opstartlader kiezen, omdat enkel Grub2-efi beschikbaar is."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Als uw computer nog geen besturingssysteem had, dan maakte het Mageia-"
-"installatieprogramma een ESP (EFI-SysteemPartitie) voor de opstartlader "
-"(Grub2-efi). Stond er echter al eerder een UEFI-besturingssysteem op (bijv. "
-"Windows 8), dan detecteert Mageia de bestaande ESP die door Windows werd "
-"gecreëerd en wordt de grub2-efi-opstartlader daar ingevoegd. Alhoewel het "
-"mogelijk is verscheidene ESP's te hebben, wordt aanbevolen het bij één te "
-"laten. Één is genoeg, ongeacht het aantal besturingssystemen dat u heeft."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "Wijzig het \"Opstartapparaat\" niet, tenzij u weet wat u doet."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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
@@ -4642,22 +4748,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX zou deze dan goed moeten instellen."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Geluidsconfiguratie"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4667,7 +4774,7 @@ msgstr ""
 "geluidskaart. Het is het standaardstuurprogramma als we dat hebben."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4682,7 +4789,7 @@ msgstr ""
 "in het scherm."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4693,12 +4800,12 @@ msgstr ""
 "guibutton> voor zeer bruikbaar advies om het probleem op te lossen."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Geavanceerd"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4709,7 +4816,7 @@ msgstr ""
 "stuurprogramma's beschikbaar zijn, maar u denkt dat de verkeerde gekozen is."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4879,12 +4986,12 @@ msgid "Uninstalling Mageia"
 msgstr "Mageia deïnstalleren"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Howto"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4895,7 +5002,7 @@ msgstr ""
 "installatie ongedaan te maken. Dat geldt niet voor elk besturingssysteem."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4907,7 +5014,7 @@ msgstr ""
 "besturingssysteem te kiezen."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4926,7 +5033,7 @@ msgstr ""
 "guibutton>. De ruimte komt beschikbaar."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4935,7 +5042,7 @@ msgstr ""
 "De partitie kreeg een partitie letter."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4993,3 +5100,309 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Echter, terwijl u uw nieuwe installatie gebruikt zal elke gebruiker die u "
+#~ "in <emphasis>MCC - Systeem - Gebruikers op het systeem beheren</emphasis> "
+#~ "toevoegt, een homedirectory hebben die tegen lezen en schrijven beschermd "
+#~ "is."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Als u voor niemand een homedirectory wilt die door iedereen gelezen kan "
+#~ "worden, wordt aangeraden nu alleen een tijdelijke gebruiker toe te voegen "
+#~ "en de echte pas na het herstarten van uw computer."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "Dual arch DVD"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Beide architecturen zijn beschikbaar op hetzelfde medium, de keuze wordt "
+#~ "automatisch gemaakt overeenkomstig de gedetecteerde CPU."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Enkel XFCE-werkomgeving"
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Niet alle talen zijn beschikbaar. (be, bg, ca, de, en, es, fr, it, mk, "
+#~ "pl, pt, ru, sv, uk) NOG CHECKEN!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Het bevat niet-vrije software."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "KDE Live CD"
+
+#~ msgid "32 bit only."
+#~ msgstr "Enkel 32 bits"
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "GNOME Live CD"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Met een BIOS-systeem"
+
+#~ 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."
+#~ msgstr ""
+#~ "U kunt een ingang (in het scherm \"waarde\" genoemd) toevoegen of er een "
+#~ "selecteren om aan te passen. Klik op de betreffende knop in het "
+#~ "<emphasis>Configuratie van Opstartlader</emphasis> scherm en bewerk de "
+#~ "gegevens in het scherm dat zich op de voorgrond opent."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Als u <code>Grub 2</code> als opstartlader heeft gekozen kunt u deze tool "
+#~ "niet gebruiken om ingangen aan te passen. Klik op 'Volgende'. U kunt wel "
+#~ "handmatig <code>/boot/grub2/custom.cfg</code> bewerken, of de tool "
+#~ "<code>grub-customizer</code> gebruiken."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Een paar dingen die zonder enig risico gedaan kunnen worden, zijn de naam "
+#~ "van een menu-ingang veranderen en het hokje aanvinken waarmee een waarde "
+#~ "de standaard ingang wordt."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "U kunt het juiste versienummer van een ingang toevoegen of deze helemaal "
+#~ "hernoemen."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "De Standaard waarde of ingang, is die die gestart wordt als u geen keuze "
+#~ "maakt tijdens het opstarten van uw computer."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Door andere dingen te veranderen kan het gebeuren dat u uw systeem niet "
+#~ "meer kunt opstarten. Probeer alstublieft niets zonder precies te weten "
+#~ "wat u doet."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "In dit geval gebruikt u Grub2-efi en kunt u deze tool niet gebruiken om "
+#~ "ingangen aan te passen. Dat kan wel door <code>/boot/grub2/custom.cfg</"
+#~ "code> te bewerken of de tool <code>grub-customizer</code> gebruiken. Het "
+#~ "enige dat u hier kunt doen is de standaard ingang kiezen in de "
+#~ "uitvouwlijst."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Nadat u op <guibutton>Volgende</guibutton> heeft geklikt, volgt er nog "
+#~ "een lijst waarmee u de beeldresolutie voor Grub2, een grafische "
+#~ "opstartlader, kunt kiezen."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Als u liever andere opstartladerinstellingen heeft dan DrakX koos, kunt u "
+#~ "ze hier veranderen."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Misschien heeft u al een ander besturingssysteem op uw machine, in dat "
+#~ "geval moet u besluiten of u Mageia aan uw bestaande opstartlader wilt "
+#~ "toevoegen, of dat u Mageia toestaat een nieuwe te creëren."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Standaard schrijft Mageia een nieuwe GRUB-(legacy-)opstartlader in de MBR "
+#~ "(Master Boot Record) van uw eerste harde schijf. Als u al andere "
+#~ "besturingssystemen heeft, probeert Mageia ze aan uw nieuwe Mageia "
+#~ "opstartmenu toe te voegen."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia biedt nu, naast de mogelijkheid om GRUB legacy of Lilo als "
+#~ "opstartlader te nemen, ook GRUB2 als keuze aan."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linux systemen die de GRUB2 opstartlader gebruiken worden nog niet door "
+#~ "GRUB(-legacy) ondersteund en zullen niet herkend worden als de standaard "
+#~ "GRUB opstartlader gebruikt wordt."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "De beste oplossing hiervoor is de GRUB2 opstartlader te gebruiken, die "
+#~ "tijdens het installeren in de Overzichtspagina beschikbaar is."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Als u besluit een bestaande opstartlader te gebruiken, moet u er tijdens "
+#~ "de installatie aan denken te STOPPEN in de overzichtspagina en op de "
+#~ "Opstartlader <guibutton>Configureren</guibutton> knop te klikken, waarna "
+#~ "u de locatie kunt veranderen waar de opstartlader geplaatst wordt."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Kies geen apparaat zoals \"sda\", anders overschrijft u uw bestaande MBR. "
+#~ "U moet de root partitie selecteren die u eerder tijdens de installatie "
+#~ "koos, bijvoorbeeld \"sda7\"."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Ter verduidelijking, sda is een apparaat, sda7 is een partitie."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Ga naar tty2 met Ctrl+Alt+F2 en type <literal>df</literal> om te "
+#~ "controleren waar uw <literal>/</literal> (root) partitie is. Ctrl+Alt+F7 "
+#~ "brengt u terug naar het installatiescherm."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Geavanceerde optie voor de opstartlader"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Als u zeer weinig schijfruimte heeft voor de <literal>/</literal> "
+#~ "partitie met <literal>/tmp</literal>, klik dan op <guibutton>Geavanceerd</"
+#~ "guibutton> en zet een vinkje voor <guilabel>Elke keer bij opstarten /tmp "
+#~ "legen</guilabel>. Dit helpt om wat vrije ruimte te behouden."
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index ac54757b..09ea4c04 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-11-13 21:03+0000\n"
 "Last-Translator: Szymon Scholz <szymonscholz@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -189,26 +189,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Zarządzanie użytkownikami"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -216,12 +205,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Ustawienie hasła administratora (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -240,7 +229,7 @@ msgstr ""
 "poniżej."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -249,12 +238,12 @@ msgstr ""
 "hasła zawierającego litery (duże i małe), numery oraz inne znaki."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Dodaj użytkownika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -266,7 +255,7 @@ msgstr ""
 "które wykonuje na swoim komputerze przeciętny użytkownik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -274,7 +263,7 @@ msgstr ""
 "<guibutton>Ikona</guibutton>: użycie tego przycisku zmieni ikonę użytkownika."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -283,7 +272,7 @@ msgstr ""
 "pola tekstowego"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -295,7 +284,7 @@ msgstr ""
 "ma znaczenie.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -306,7 +295,7 @@ msgstr ""
 "\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -316,56 +305,36 @@ msgstr ""
 "tym polu, instalator sprawdzi czy hasła się zgadzają."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Wszyscy użytkownicy, których dodasz podczas instalacji Magei, będą mieli "
 "katalogi domowe (dostępne do odczytu dla każdego, ale do zapisu tylko dla "
 "danego użytkownika)"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Użytkownicy, których dodasz po zainstalowaniu systemu poprzez <emphasis>MCC "
-"- System - Zarządzanie użytkownikami</emphasis> będą posiadali katalogi "
-"domowe zabezpieczone przed odczytem oraz zapisem przez innych użytkowników."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:83
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
-"Jeśli nie chcesz tworzyć użytkowników z katalogami domowymi możliwymi do "
-"odczytu przez innych, zaleca się utworzenie tylko tymczasowego użytkownika "
-"podczas instalacji i dodanie prawdziwych użytkowników po restarcie systemu."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"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:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Zaawansowane Zarządzanie Użytkownikami"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -374,12 +343,12 @@ msgstr ""
 "możliwość edycji ustawień dla użytkownika którego dodajesz."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -389,7 +358,7 @@ msgstr ""
 "wykasowane po jego wylogowaniu. Gość musi zapisywać ważne pliki na USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -400,7 +369,7 @@ msgstr ""
 "przez gości, ale posiada mniejsze uprawnienia niż zwykły użytkownik."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -410,7 +379,7 @@ msgstr ""
 "przez użytkownika, którego dodajesz, do wyboru Bash, Dash oraz Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -418,7 +387,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -761,12 +730,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Wybór pulpitu"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -775,7 +744,7 @@ msgstr ""
 "ekrany, aby dokonać dalszych ustawień instalacji."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -786,16 +755,17 @@ msgstr ""
 "guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -814,22 +784,23 @@ msgstr ""
 "zainstalowanych programów."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Wybór grup pakietów"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -841,22 +812,22 @@ msgstr ""
 "najeżdżając na nie myszą."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Stacja robocza"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Serwer"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Środowisko graficzne"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -865,10 +836,10 @@ msgstr ""
 "samodzielnie dodawać lub usuwać pakiety."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1280,20 +1251,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1306,7 +1281,7 @@ msgstr ""
 "to uruchomienie systemu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1314,7 +1289,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1324,7 +1299,7 @@ msgstr ""
 "urządzenia."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1333,7 +1308,7 @@ msgstr ""
 "partycje znajdujące się na wybranym dysku."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1343,43 +1318,72 @@ msgstr ""
 "ją usunąć."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Kontynuuj aż do momentu gdy skonfigurujesz wszystko zgodnie ze swoimi "
 "preferencjami."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1389,7 +1393,7 @@ msgstr ""
 "propozycje instalatora dotyczące instalacji <application>Magei</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1398,19 +1402,31 @@ msgstr ""
 "twardego oraz jego zawartości."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Użyj istniejących partycji"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1419,12 +1435,12 @@ msgstr ""
 "linuksowe i mogą być użyte do instalacji."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Wykorzystaj wolne miejsce"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1433,12 +1449,12 @@ msgstr ""
 "wykorzystane do instalacji Magei."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1447,7 +1463,7 @@ msgstr ""
 "zaproponuje, aby je wykorzystać."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 +1474,7 @@ msgstr ""
 "kopię zapasową ważnych plików!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1475,7 +1491,7 @@ msgstr ""
 "wskazane jest zrobienie kopii zapasowej ważnych plików."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1484,29 +1500,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Wymaż i wykorzystaj cały dysk"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ta opcja użyje całego dysku dla Magei."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1516,12 +1541,12 @@ msgstr ""
 "dysku dane, których nie chcesz stracić, nie używaj tej opcji."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Własne"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1529,55 +1554,55 @@ msgstr ""
 "Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1585,8 +1610,47 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1603,17 +1667,17 @@ msgstr ""
 "pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1726,27 +1790,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulacje"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1757,26 +1818,26 @@ msgstr ""
 "komputer ponownie."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1909,6 +1970,11 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2497,30 +2563,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2528,18 +2580,40 @@ msgid ""
 "<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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parametry systemu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Strefa czasowa</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2547,110 +2621,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Kraj / Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, 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:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>System rozruchowy</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+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:75
+#: en/misc-params.xml:69
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 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:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Usługi</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 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:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Parametry sprzętu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klawiatura</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr ""
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mysz</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Karta dźwiękowa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2658,41 +2738,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Sieć</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2701,19 +2783,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2721,51 +2803,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Bezpieczeństwo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Poziom Bezpieczeństwa</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2774,27 +2857,43 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Uruchom ponownie"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
@@ -2848,29 +2947,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Wybierz i użyj obrazu ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Wprowadzenie"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2879,7 +2978,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2887,22 +2986,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Nośnik"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definicja"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2910,116 +3009,88 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr ""
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3027,63 +3098,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "tylko 32-bit"
-
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3092,49 +3153,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr ""
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Pobieranie i Sprawdzanie Mediów"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Pobieranie"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3143,12 +3209,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3156,22 +3222,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Sprawdzanie integralności pobranych mediów"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3181,55 +3247,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3238,19 +3304,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3258,101 +3324,101 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3360,7 +3426,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3384,76 +3450,75 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3462,28 +3527,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3798,286 +3861,364 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Podstawowe opcje programu rozruchowego"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Podstawowe opcje programu rozruchowego"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Podstawowe opcje programu rozruchowego"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set 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><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Usługi</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -4128,22 +4269,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX powinien być wtedy w stanie odpowiednio skonfigurować  dysk(i)."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Konfiguracja dźwięku"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4151,7 +4293,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4161,7 +4303,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4169,12 +4311,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Zaawansowane"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4182,7 +4324,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4333,12 +4475,12 @@ msgid "Uninstalling Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4346,7 +4488,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4354,7 +4496,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4366,14 +4508,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4420,3 +4562,86 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Użytkownicy, których dodasz po zainstalowaniu systemu poprzez "
+#~ "<emphasis>MCC - System - Zarządzanie użytkownikami</emphasis> będą "
+#~ "posiadali katalogi domowe zabezpieczone przed odczytem oraz zapisem przez "
+#~ "innych użytkowników."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Jeśli nie chcesz tworzyć użytkowników z katalogami domowymi możliwymi do "
+#~ "odczytu przez innych, zaleca się utworzenie tylko tymczasowego "
+#~ "użytkownika podczas instalacji i dodanie prawdziwych użytkowników po "
+#~ "restarcie systemu."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "32 bit only."
+#~ msgstr "tylko 32-bit"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index db3444bb..f7efd47b 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:53+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -186,26 +186,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gerenciador de Usuário e Superusuário"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -213,12 +202,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Definir senha do administrador (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -239,7 +228,7 @@ msgstr ""
 "digitado corretamente a primeira senha, comparando-as."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -249,12 +238,12 @@ msgstr ""
 "minúsculas), números e outros caracteres em uma senha."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Digite um usuário"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -266,7 +255,7 @@ msgstr ""
 "usuário médio faz com o seu computador."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -275,7 +264,7 @@ msgstr ""
 "de usuários."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -284,7 +273,7 @@ msgstr ""
 "texto."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -295,7 +284,7 @@ msgstr ""
 "login é \"case sensitive\"."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -306,7 +295,7 @@ msgstr ""
 "força da senha. (Veja também o <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -317,41 +306,22 @@ msgstr ""
 "caixas de texto de senha do usuário."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Qualquer usuário que você acrescenta instalando Mageia, terá um mundo "
 "legível (estará protegido) o diretório de home."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"No entanto, durante a utilização da nova instalação, qualquer usuário "
-"adicionar em <emphasis> MCC - Sistema - Gerenciar usuários no sistema </"
-"emphasis> terá um diretório que é ler e escrever protegidos."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Se você não quer um diretório legível ou um qualquer, é aconselhável "
-"adicionar apenas um usuário temporário, para adicionar um real(s) somente "
-"após a reinicialização."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Se você prefere diretórios home legíveis mundiais, você pode querer "
 "acrescentar todos os usuários necessários extra <emphasis>Configuração - "
@@ -359,18 +329,18 @@ msgstr ""
 "de Usuário </emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Gerenciamento Avançado de Usuários"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -380,12 +350,12 @@ msgstr ""
 "adicionando."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -397,7 +367,7 @@ msgstr ""
 "importantes em um pendrive USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -409,7 +379,7 @@ msgstr ""
 "usuários normais."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -420,7 +390,7 @@ msgstr ""
 "opções são Bash, Dash e Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -431,7 +401,7 @@ msgstr ""
 "Deixe em branco se você não sabe o que está fazendo."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -817,12 +787,12 @@ msgstr ""
 "\"testing\"> passos adicionais no modo Live </link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Seleção de Área de Trabalho"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -831,7 +801,7 @@ msgstr ""
 "para ajustar as suas escolhas."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -842,16 +812,17 @@ msgstr ""
 "desativada pressionando o botão <guilabel>Detalhes</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -870,22 +841,23 @@ msgstr ""
 "ostentando colírio para os olhos e menos pacotes instalado por padrão."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Seleção de Grupo de Pacotes"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -899,22 +871,22 @@ msgstr ""
 "mouse é passado sobre eles."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Estação de trabalho."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Servidor."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Ambiente Gráfico."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -923,10 +895,11 @@ msgstr ""
 "remover pacotes manualmente."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref> para obter instruções sobre "
 "como fazer uma instalação mínima (sem ou com X &amp; IceWM)."
@@ -1413,23 +1386,24 @@ msgstr ""
 "seleções."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1442,7 +1416,7 @@ msgstr ""
 "literal> NÃO deve ser feita, caso contrário, seu sistema não inicializará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1453,7 +1427,7 @@ msgstr ""
 "mesmo ver o que está neles antes de começar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1463,7 +1437,7 @@ msgstr ""
 "deles."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1472,7 +1446,7 @@ msgstr ""
 "no dispositivo de armazenamento selecionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1482,44 +1456,79 @@ msgstr ""
 "montagem, redimensioná-la ou limpá-la."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continue até que você ajustar tudo como desejar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Se você estiver instalando Mageia em um sistema UEFI, verificar que um ESP "
 "(EFI partição do sistema) está presente e corretamente montada em /boot/EFI "
 "(veja acima)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Se você estiver instalando Mageia em um sistema UEFI, verificar que um ESP "
+"(EFI partição do sistema) está presente e corretamente montada em /boot/EFI "
+"(veja acima)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1530,7 +1539,7 @@ msgstr ""
 "instalar <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1539,21 +1548,32 @@ msgstr ""
 "conteúdo específicos do(s) seu(s) disco(s) rígido(s)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Utilizar as partições existentes"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1562,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Usar o espaço livre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1576,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:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1590,7 +1610,7 @@ msgstr ""
 "instalador pode oferecer para usá-lo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1601,7 +1621,7 @@ msgstr ""
 "ter um backup de todos os arquivos importantes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1618,7 +1638,7 @@ msgstr ""
 "altamente recomendável fazer backup de seus arquivos pessoais."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1631,7 +1651,7 @@ 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:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1639,25 +1659,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Apagar e utilizar o Disco Inteiro."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 +1698,12 @@ msgstr ""
 "opção."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Personalizado"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1682,12 +1712,12 @@ msgstr ""
 "rígido(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partições de dimensionamento:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1696,7 +1726,7 @@ msgstr ""
 "regras:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1705,7 +1735,7 @@ msgstr ""
 "criada para /, não haverá nenhuma partição separada para /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1713,23 +1743,23 @@ msgstr ""
 "criadas"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "o restante (pelo menos 12/19) é atribuído ao /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1739,7 +1769,7 @@ msgstr ""
 "para /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1751,8 +1781,48 @@ msgstr ""
 "boot/EFI. A opção \"Custom\" é a única que permite verificar caso tenha sido "
 "feita corretamente"
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1771,17 +1841,17 @@ msgstr ""
 "alternativo, tipo o gparted, e use a seguinte configuração:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Arredondar para\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Espaço livre Antes (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1894,27 +1964,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Parabéns"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"></imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1924,7 +1991,7 @@ msgstr ""
 "agora é seguro remover a mídia de instalação e reiniciar o seu computador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1934,7 +2001,7 @@ msgstr ""
 "(se você tiver mais de um)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1943,12 +2010,12 @@ msgstr ""
 "instalação Mageia será automaticamente selecionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Divirta-se!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2084,6 +2151,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2752,30 +2824,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resumo de diversos parâmetros"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summary.png\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2787,18 +2845,40 @@ msgstr ""
 "DrakX. Você pode verificar as configurações aqui e alterá-las se você "
 "quiser, depois de pressionar <guibutton>Configurar</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parâmetros do Sistema"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fuso horário</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2809,12 +2889,12 @@ msgstr ""
 "\"configureTimezoneUTC\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>País / Região</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2823,36 +2903,36 @@ msgstr ""
 "configuração. Ver <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Gerenciador de Inicialização</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr ""
 "Não altere nada, a menos que você saiba como configurar o Grub e/ou o Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gerenciamento de usuário</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2861,12 +2941,12 @@ msgstr ""
 "próprios diretórios na pasta <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Serviços</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2876,7 +2956,7 @@ msgstr ""
 "certas tarefas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2885,22 +2965,22 @@ msgstr ""
 "erro pode impedir o seu computador de funcionar corretamente."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Parâmetro de Hardware"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Teclado</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2908,13 +2988,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mouse</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2923,12 +3010,12 @@ msgstr ""
 "tablets, trackballs, etc"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Placa de Som</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2939,44 +3026,45 @@ msgstr ""
 "mas nenhum deles é o padrão."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interface Gráfica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Parâmetros de rede e internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rede</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2989,7 +3077,7 @@ msgstr ""
 "repositórios de mídia Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2998,12 +3086,12 @@ msgstr ""
 "firewall para ver aquela interface também."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -3014,7 +3102,7 @@ msgstr ""
 "serviço proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -3023,17 +3111,17 @@ msgstr ""
 "parâmetros que você precisa inserir aqui."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Segurança"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 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:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3042,17 +3130,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:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3061,10 +3149,12 @@ msgstr ""
 "patifes lá fora, na internet, que possam comprometer ou roubar eles."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Selecione os serviços que você deseja que tenha acesso ao seu sistema. Suas "
 "opções vão depender de para que você usa seu computador."
@@ -3076,26 +3166,39 @@ msgstr ""
 "Ter em mente que permitir tudo (sem firewall) pode ser muito arriscado."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Reboot"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Uma vez que o carregador de inicialização foi instalado, você será "
+"solicitado a parar o seu computador, remova o Live CD reinicie o computador. "
+"Quando você reiniciar, você verá uma sucessão de barras progresso da "
+"transferência. Eles indicam que as mídias de software estão sendo "
+"transferidas (consulte Gerenciamento de Software)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Uma vez que o carregador de inicialização foi instalado, você será "
 "solicitado a parar o seu computador, remova o Live CD reinicie o computador. "
@@ -3103,6 +3206,16 @@ msgstr ""
 "transferência. Eles indicam que as mídias de software estão sendo "
 "transferidas (consulte Gerenciamento de Software)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3163,17 +3276,17 @@ msgstr ""
 "segurança na aba <guilabel>Segurança</guilabel> do Centro de Controle Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Selecionar e usar ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introdução"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3182,12 +3295,12 @@ msgstr ""
 "escolher qual imagem corresponde às suas necessidades."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Há duas famílias de mídia:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3201,7 +3314,7 @@ msgstr ""
 "instalar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3212,22 +3325,22 @@ msgstr ""
 "instalação é semelhante, mas você fará menos escolhas."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Mídia"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definição"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3238,7 +3351,7 @@ msgstr ""
 "físico do arquivo ISO é copiado para."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3247,23 +3360,23 @@ msgstr ""
 "\">aqui</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Classical installation media"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "características comuns"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3271,17 +3384,17 @@ msgstr ""
 "anteriores."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Diferentes meios para arquitetura de 32 ou 64 bits."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3290,58 +3403,25 @@ msgstr ""
 "Sistema, teste de memória, hardware ferramenta de detecção."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Você vai ser dada a opção durante a instalação para adicionar software non "
 "free."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "Dupla Arquitetura DVD"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Ambas as arquitecturas estão presentes na mesma forma, a escolha é feita "
-"automaticamente de acordo com a CPU detectada."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Usa somente Desktop Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Nem todas as línguas estão disponíveis. (be, bg, ca, de, en, es, fr, it, mk, "
-"pl, pl, ru, sv, Reino Unido) para SER VERIFICADO!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Contém software non free."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Mídia Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3350,18 +3430,20 @@ msgstr ""
 "rígido, e, opcionalmente, instalar Mageia no seu Disco Rígido."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Cada ISO contém apenas um Ambiente de Desktop (KDE ou GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3372,63 +3454,57 @@ msgstr ""
 "anteriores.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Contêm software não livre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Ambiente de Desktop KDE somente."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Somente linguagem Inglês. "
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "32 bit somente."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Todas as línguas estão presentes."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Ambiente Desktop GNOME somente."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Todas as línguas estão presentes."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Ambiente de Desktop KDE somente."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Mídia de CD somente de Inicialização"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3442,7 +3518,7 @@ msgstr ""
 "local, em uma rede local ou na Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3452,13 +3528,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Somente linguagem Inglês. "
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Inicie a instalação do"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3466,12 +3548,13 @@ msgstr ""
 "Contém apenas software livre, para aqueles que rejeitam software não-livre."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3480,17 +3563,17 @@ msgstr ""
 "precisa."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Baixando e checando Mídia"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Baixando"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3503,12 +3586,12 @@ msgstr ""
 "http for escolhido, você também pode ver algo como"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3519,22 +3602,22 @@ msgstr ""
 "posterior utilização </link>. Em seguida, esta janela será exibida:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Verifique a de opção Salvar arquivo."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Verificando a integridade de mídia baixada"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3549,12 +3632,12 @@ msgstr ""
 "uma falha. Uma falha conclui que você deve repetir o download."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3563,7 +3646,7 @@ msgstr ""
 "para/o/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3572,7 +3655,7 @@ msgstr ""
 "para/o/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3581,17 +3664,17 @@ msgstr ""
 "um tempo) com o número dado pelo Mageia. exemplo:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Queimar ou despejar a ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3601,12 +3684,12 @@ msgstr ""
 "de inicialização-poder."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3620,12 +3703,12 @@ msgstr ""
 "da Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3634,7 +3717,7 @@ 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3645,7 +3728,7 @@ msgstr ""
 "capacidade de separação irá ser reduzida ao tamanho da imagem."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3654,12 +3737,12 @@ msgstr ""
 "reformatar o dispositivo USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3668,17 +3751,17 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Você poderia tentar:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3687,7 +3770,7 @@ msgstr ""
 "a opção \"ISO image\" ;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3696,12 +3779,12 @@ msgstr ""
 "do Disco Win32</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3711,17 +3794,17 @@ msgstr ""
 "identificação errado."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Abra um console"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3730,12 +3813,12 @@ msgstr ""
 "final '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3744,17 +3827,17 @@ 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:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3765,7 +3848,7 @@ msgstr ""
 "<emphasis>sd</emphasis>, e <emphasis>sdd</emphasis> neste caso:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3807,7 +3890,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3816,7 +3899,7 @@ msgstr ""
 "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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3825,12 +3908,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Onde X=o nome do dispositivo, por exemplo: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3839,37 +3922,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Desligue o seu dispositivo USB, e pronto"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Selecione seu país / região"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3878,7 +3961,7 @@ msgstr ""
 "errado pode levar a não ser capaz de usar uma rede sem fio."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3887,7 +3970,7 @@ msgstr ""
 "guilabel> e escolha seu país / região lá."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3900,21 +3983,20 @@ msgstr ""
 "escolha real."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Método de entrada"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "método de entrada (na parte inferior da lista). Métodos de entrada permitem "
@@ -3927,10 +4009,11 @@ msgstr ""
 "as mídias HTTP/FTP antes da seleção do pacote."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Se você perdeu a configuração do método de entrada durante a instalação, "
@@ -4269,360 +4352,393 @@ msgstr ""
 "botões."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Para obter mais informações sobre as opções de kernel em sistemas legados e "
+"UEFI, consulte: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Principais Opções do Gerenciador de Inicialização"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Com um sistema Bios"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Principais Opções do Gerenciador de Inicialização"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Você pode adicionar uma entrada ou modificar a que você selecionar primeiro, "
-"pressionando o botão correspondente na janela de <emphasis>Configuração do "
-"Menu de Inicialização</emphasis> e editando a janela que abrir em cima dela."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Com um sistema UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "O menu gráfico Mageia é agradável:"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Se você escolheu <code>Grub 2</code> como seu gerenciador de inicialização, "
-"você não pode usar esta ferramenta para editar entradas neste passo, "
-"pressione 'Next'. Você precisa editar manualmente <code>/boot/grub2/custom."
-"cfg</code> ou usar <code>grub-customizer</code> em seu lugar."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+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:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Com um sistema UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Algumas coisas que podem ser feitas sem qualquer risco são, mudar o rótulo "
-"de uma entrada e selecionar a caixa de uma entrada para torná-la padrão."
+"Com um sistema UEFI, a interface do usuário é um pouco diferente, como você "
+"não pode escolher o gestor de arranque uma vez apenas Grub2-efi está "
+"disponível."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Você pode adicionar o número da versão correta de uma entrada, ou renomeá-la "
-"completamente."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"A entrada padrão vai inicializar o sistema se você não fizer uma escolha "
-"durante a inicialização."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Editar outras coisas que podem deixá-lo com um sistema que não inicia. Por "
-"favor, não tente algo sem saber o que está fazendo."
+"Se a Mageia é o primeiro sistema instalado no seu computador, o instalador "
+"criou um ESP (partição de sistema EFI) para receber o bootloader (Grub2-"
+"efi). Se já havia sistemas operacionais UEFI previamente instalado no seu "
+"computador (Windows 8 por exemplo), o instalador detectou o ESP existente "
+"criado pelo Windows e adicionados o grub2-efi Mageia. Embora seja possível "
+"ter vários ESPs, aconselha-se única e suficiente seja qual for o número de "
+"sistemas operacionais que você tem."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Com um sistema UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Usando o Gerenciador de Inicialização da Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Neste caso, você está usando Grub2-efi e você não pode usar essa ferramenta "
-"para editar entradas nesta etapa. Para fazer isso você precisa editar "
-"manualmente <code>/boot/grub2/custom.cfg</code> ou usar <code>grub-"
-"customizer</code> em seu lugar. Tudo o que você pode fazer aqui, é escolher "
-"a entrada padrão na lista suspensa."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Depois de um clique no botão <guibutton>Proximo</guibutton>, outra lista "
-"suspensa permite escolher a resolução de vídeo para Grub2 que é um "
-"carregador de inicialização gráfico."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Principais Opções do Gerenciador de Inicialização"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Usando um Gerenciador de Inicialização existente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+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 "
+"maioria dos casos irá envolver a execução adequado de um programa de "
+"instalação do Gerenciador de Inicialização, que deve detectá-lo e adicioná-"
+"lo automaticamente. Consulte a documentação para o sistema operacional em "
+"questão."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Se você preferir que as configurações do gerenciador de inicialização "
-"(bootloader) sejam diferentes daquelas escolhidas automaticamente pelo "
-"instalador, você pode alterá-las aqui."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Você pode já ter outro sistema operacional em sua máquina, neste caso, você "
-"precisa decidir se deseja adicionar a Mageia no seu gerenciador de "
-"inicialização existente, ou permitir que a Mageia crie um novo."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "O menu gráfico Mageia é agradável:"
-
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Usando o Gerenciador de Inicialização da Mageia"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Por padrão, Mageia grava um novo bootloader (legado) de GRUB no MBR (Master "
-"Boot Record) do seu disco rígido primeiro. Se você já tem outros sistemas "
-"operacionais instalados, a Mageia tenta adicioná-los ao seu novo menu de "
-"inicialização do Mageia."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"A Mageia agora oferece também o GRUB2 como gerenciador de inicialização "
-"opcional, em adição ao GRUB original e Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Sistemas Linux que utilizam o bootloader do GRUB2 não são atualmente "
-"suportados pelo GRUB (legado) e não serão reconhecidos se o bootloader GRUB "
-"padrão é usado."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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."
 msgstr ""
-"A melhor solução neste caso é utilizar o gerenciador de inicialização GRUB2 "
-"que está disponível na página de resumo durante a instalação."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Usando um Gerenciador de Inicialização existente"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Se você decidir usar um Gerenciador de Inicialização existente, então você "
-"precisa se lembrar de PARAR na página de resumo durante a instalação e "
-"clicar no botão <guibutton>Configurar</guibutton> \"Gerenciador de "
-"Inicialização\", o que permitirá que você mude o local de instalação do "
-"Gerenciador de Inicialização."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Não selecione um dispositivo e.g.\"sda\", ou você irá sobrescrever sua MBR "
-"existente. Você deve selecionar a partição raiz que você escolheu durante a "
-"fase de particionamento mais cedo, por exemplo, sda7."
+"<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."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Para ficar claro, sda é um dispositivo, sda7 é uma partição."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Serviços</guilabel>:"
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Ir para tty2 com Ctrl+Alt+F2 e tecle <literal>df</literal> para verificar "
-"onde a partição <literal>/</literal> (raiz) está.  Ctrl+Alt+F7 leva você de "
-"volta para a tela do instalador."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 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 "
-"maioria dos casos irá envolver a execução adequado de um programa de "
-"instalação do Gerenciador de Inicialização, que deve detectá-lo e adicioná-"
-"lo automaticamente. Consulte a documentação para o sistema operacional em "
-"questão."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Opções Avançadas do Gerenciador de Inicialização"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Se você tiver espaço em disco muito limitado para a partição <literal>/</"
-"literal> (raiz) que contém <literal>/tmp</literal>, clique em "
-"<guibutton>Avançado</guibutton> e marque a caixa <guilabel>Limpar /tmp a "
-"cada inicialização</guilabel>. Isto ajuda a obter algum espaço livre "
-"adicional."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Com um sistema UEFI, a interface do usuário é um pouco diferente, como você "
-"não pode escolher o gestor de arranque uma vez apenas Grub2-efi está "
-"disponível."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Se a Mageia é o primeiro sistema instalado no seu computador, o instalador "
-"criou um ESP (partição de sistema EFI) para receber o bootloader (Grub2-"
-"efi). Se já havia sistemas operacionais UEFI previamente instalado no seu "
-"computador (Windows 8 por exemplo), o instalador detectou o ESP existente "
-"criado pelo Windows e adicionados o grub2-efi Mageia. Embora seja possível "
-"ter vários ESPs, aconselha-se única e suficiente seja qual for o número de "
-"sistemas operacionais que você tem."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Não modifica o \"Boot Device\", a menos que realmente saber o que fazer."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4673,22 +4789,23 @@ msgstr ""
 "O DrakX deve então ser capaz de configurar o dispositivo(s) corretamente."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Configuração de Som"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4698,7 +4815,7 @@ msgstr ""
 "foi dado, que será o driver padrão, se temos um padrão."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4714,7 +4831,7 @@ msgstr ""
 "tela."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4726,12 +4843,12 @@ msgstr ""
 "resolver o problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avançado"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4742,7 +4859,7 @@ msgstr ""
 "disponíveis, quando achar que o instalador escolheu errado."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4915,12 +5032,12 @@ msgid "Uninstalling Mageia"
 msgstr "Desinstalar o Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Como"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4932,7 +5049,7 @@ msgstr ""
 "operacional."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4944,7 +5061,7 @@ msgstr ""
 "sistema operacional."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4963,7 +5080,7 @@ msgstr ""
 "partições e selecione <guibutton>Excluir</guibutton>. O espaço será liberado."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4972,7 +5089,7 @@ msgstr ""
 "formatá-lo (FAT32 ou NTFS). Ele vai receber uma carta de partição."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -5033,6 +5150,315 @@ msgstr ""
 "minutos. No final, você recebe uma tela em branco por algum tempo, é normal."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "No entanto, durante a utilização da nova instalação, qualquer usuário "
+#~ "adicionar em <emphasis> MCC - Sistema - Gerenciar usuários no sistema </"
+#~ "emphasis> terá um diretório que é ler e escrever protegidos."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Se você não quer um diretório legível ou um qualquer, é aconselhável "
+#~ "adicionar apenas um usuário temporário, para adicionar um real(s) somente "
+#~ "após a reinicialização."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summary.png\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\"></imagedata> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"summaryBottom-im1\"></imagedata> "
+#~ "</imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "Dupla Arquitetura DVD"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Ambas as arquitecturas estão presentes na mesma forma, a escolha é feita "
+#~ "automaticamente de acordo com a CPU detectada."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Usa somente Desktop Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Nem todas as línguas estão disponíveis. (be, bg, ca, de, en, es, fr, it, "
+#~ "mk, pl, pl, ru, sv, Reino Unido) para SER VERIFICADO!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Contém software non free."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "32 bit somente."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Com um sistema Bios"
+
+#~ 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."
+#~ msgstr ""
+#~ "Você pode adicionar uma entrada ou modificar a que você selecionar "
+#~ "primeiro, pressionando o botão correspondente na janela de "
+#~ "<emphasis>Configuração do Menu de Inicialização</emphasis> e editando a "
+#~ "janela que abrir em cima dela."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Se você escolheu <code>Grub 2</code> como seu gerenciador de "
+#~ "inicialização, você não pode usar esta ferramenta para editar entradas "
+#~ "neste passo, pressione 'Next'. Você precisa editar manualmente <code>/"
+#~ "boot/grub2/custom.cfg</code> ou usar <code>grub-customizer</code> em seu "
+#~ "lugar."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Algumas coisas que podem ser feitas sem qualquer risco são, mudar o "
+#~ "rótulo de uma entrada e selecionar a caixa de uma entrada para torná-la "
+#~ "padrão."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Você pode adicionar o número da versão correta de uma entrada, ou renomeá-"
+#~ "la completamente."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "A entrada padrão vai inicializar o sistema se você não fizer uma escolha "
+#~ "durante a inicialização."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Editar outras coisas que podem deixá-lo com um sistema que não inicia. "
+#~ "Por favor, não tente algo sem saber o que está fazendo."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Neste caso, você está usando Grub2-efi e você não pode usar essa "
+#~ "ferramenta para editar entradas nesta etapa. Para fazer isso você precisa "
+#~ "editar manualmente <code>/boot/grub2/custom.cfg</code> ou usar <code>grub-"
+#~ "customizer</code> em seu lugar. Tudo o que você pode fazer aqui, é "
+#~ "escolher a entrada padrão na lista suspensa."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Depois de um clique no botão <guibutton>Proximo</guibutton>, outra lista "
+#~ "suspensa permite escolher a resolução de vídeo para Grub2 que é um "
+#~ "carregador de inicialização gráfico."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Se você preferir que as configurações do gerenciador de inicialização "
+#~ "(bootloader) sejam diferentes daquelas escolhidas automaticamente pelo "
+#~ "instalador, você pode alterá-las aqui."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Você pode já ter outro sistema operacional em sua máquina, neste caso, "
+#~ "você precisa decidir se deseja adicionar a Mageia no seu gerenciador de "
+#~ "inicialização existente, ou permitir que a Mageia crie um novo."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Por padrão, Mageia grava um novo bootloader (legado) de GRUB no MBR "
+#~ "(Master Boot Record) do seu disco rígido primeiro. Se você já tem outros "
+#~ "sistemas operacionais instalados, a Mageia tenta adicioná-los ao seu novo "
+#~ "menu de inicialização do Mageia."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "A Mageia agora oferece também o GRUB2 como gerenciador de inicialização "
+#~ "opcional, em adição ao GRUB original e Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Sistemas Linux que utilizam o bootloader do GRUB2 não são atualmente "
+#~ "suportados pelo GRUB (legado) e não serão reconhecidos se o bootloader "
+#~ "GRUB padrão é usado."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "A melhor solução neste caso é utilizar o gerenciador de inicialização "
+#~ "GRUB2 que está disponível na página de resumo durante a instalação."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Se você decidir usar um Gerenciador de Inicialização existente, então "
+#~ "você precisa se lembrar de PARAR na página de resumo durante a instalação "
+#~ "e clicar no botão <guibutton>Configurar</guibutton> \"Gerenciador de "
+#~ "Inicialização\", o que permitirá que você mude o local de instalação do "
+#~ "Gerenciador de Inicialização."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Não selecione um dispositivo e.g.\"sda\", ou você irá sobrescrever sua "
+#~ "MBR existente. Você deve selecionar a partição raiz que você escolheu "
+#~ "durante a fase de particionamento mais cedo, por exemplo, sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "Para ficar claro, sda é um dispositivo, sda7 é uma partição."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Ir para tty2 com Ctrl+Alt+F2 e tecle <literal>df</literal> para verificar "
+#~ "onde a partição <literal>/</literal> (raiz) está.  Ctrl+Alt+F7 leva você "
+#~ "de volta para a tela do instalador."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Opções Avançadas do Gerenciador de Inicialização"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Se você tiver espaço em disco muito limitado para a partição <literal>/</"
+#~ "literal> (raiz) que contém <literal>/tmp</literal>, clique em "
+#~ "<guibutton>Avançado</guibutton> e marque a caixa <guilabel>Limpar /tmp a "
+#~ "cada inicialização</guilabel>. Isto ajuda a obter algum espaço livre "
+#~ "adicional."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -5049,10 +5475,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
 #~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 #~ "imageobject>\t\t\t\t"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 933850af..1f55f76d 100644
--- a/docs/installer/ro.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\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/"
@@ -187,26 +187,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestionare utilizatori și administratori"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -214,12 +203,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Definiți parola administratorului (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -239,7 +228,7 @@ msgstr ""
 "două parole pentru a vă asigura că nu ați tastat greșit."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -249,12 +238,12 @@ msgstr ""
 "caractere speciale."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Introduceți un utilizator"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -266,7 +255,7 @@ msgstr ""
 "ce un utilizator obișnuit poate face cu calculatorul său."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -275,7 +264,7 @@ msgstr ""
 "pictograma utilizatorului."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -284,7 +273,7 @@ msgstr ""
 "utilizatorului."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -296,7 +285,7 @@ msgstr ""
 "majuscule.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -307,7 +296,7 @@ msgstr ""
 "<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -317,42 +306,23 @@ msgstr ""
 "ș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:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (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:102
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Totuși, după instalare, orice utilizator adăugat cu <emphasis>MCC - Sistem - "
-"Gestionați utilizatorii din sistem</emphasis> vor avea un director personal "
-"protejat atît la citire cît și la scriere."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Dacă nu doriți un director personal accesibil în citire de toată lumea, este "
-"recomandat să adăugați acum doar un utilizator temporar și să-i adăugați pe "
-"cei adevărați după repornire."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Dacă preferați directoare personale accesibile în citire pentru toată lumea, "
 "va trebui să adăugați toți utilizatorii doriți în etapa "
@@ -360,17 +330,17 @@ msgstr ""
 "utilizatori</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Gestionare avansată utilizatori"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -380,12 +350,12 @@ msgstr ""
 "îi adăugați."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -397,7 +367,7 @@ msgstr ""
 "importante pe o cheie USB."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -409,7 +379,7 @@ msgstr ""
 "restrînse decît un utilizator normal."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -420,7 +390,7 @@ msgstr ""
 "iar opțiunile sînt Bash, Dash și Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -431,7 +401,7 @@ msgstr ""
 "despre ce este vorba."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -813,12 +783,12 @@ msgstr ""
 "\"testing\">etapele adiționale în modul Live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Selectarea biroului"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -827,7 +797,7 @@ msgstr ""
 "a vă afina alegerea."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -838,16 +808,17 @@ msgstr ""
 "<guilabel>Detalii</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -867,22 +838,23 @@ msgstr ""
 "instalate implicit."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Selectarea grupurilor de pachete"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -895,22 +867,22 @@ msgstr ""
 "disponibile în infobule cînd le survolați cu mausul."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Stație de lucru."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Mediu grafic de lucru"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -919,10 +891,11 @@ msgstr ""
 "adăuga sau înlătura manual pachetele."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>."
@@ -1408,23 +1381,24 @@ msgstr ""
 "recomandă să fiți prudent în alegeri."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1437,7 +1411,7 @@ msgstr ""
 "putea demara."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1448,7 +1422,7 @@ msgstr ""
 "dimensiunea și chiar vizualiza conținutul ei înainte de a începe."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1457,7 +1431,7 @@ msgstr ""
 "de stocare, precum o cheie USB. De exemplu: sda, sdb și sdc dacă sînt trei."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1466,7 +1440,7 @@ msgstr ""
 "toate partițiile de pe dispozitivul de stocare selectat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1476,43 +1450,77 @@ msgstr ""
 "redimensiona sau chiar șterge."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continuați pînă cînd ajustați totul așa cum doriți."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+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><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1523,7 +1531,7 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1532,21 +1540,32 @@ msgstr ""
 "partiționare și conținutul discurilor."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Utilizează partițiile existente"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1555,12 +1574,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Utilizează spațiul liber"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1569,12 +1588,12 @@ msgstr ""
 "utiliza pentru noua instalare de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1583,7 +1602,7 @@ msgstr ""
 "vă poate propune să-l utilizeze."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 +1613,7 @@ msgstr ""
 "că v-ați salvat toate datele importante!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1611,7 +1630,7 @@ msgstr ""
 "Este foarte recomandat să vă salvați toate fișierele personale."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1625,7 +1644,7 @@ msgstr ""
 "imaginea de mai jos."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1633,25 +1652,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Șterge și utilizează tot discul."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Această opțiune va utiliza tot discul pentru Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1662,12 +1691,12 @@ msgstr ""
 "această opțiune."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Personalizat"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1676,12 +1705,12 @@ msgstr ""
 "dure."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1689,7 +1718,7 @@ 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:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1698,7 +1727,7 @@ msgstr ""
 "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:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1706,7 +1735,7 @@ msgstr ""
 "partiții"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1714,17 +1743,17 @@ msgstr ""
 "Go"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "restul spațiului (de cel puțin 12/19) va vi alocat pentru /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1733,7 +1762,7 @@ msgstr ""
 "crea trei partiții: 50 Go pentru /, 4 Go pentru swap și restul pentru /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1745,8 +1774,48 @@ msgstr ""
 "Opțiunea „Personalizat” este singura care vă permite să verificați dacă "
 "acest lucru a fost făcut corect."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1765,17 +1834,17 @@ msgstr ""
 "gparted, sau să folosiți parametrii următori:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Aliniază la\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Spațiu liber precedent (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1889,27 +1958,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Felicitări"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1920,7 +1986,7 @@ msgstr ""
 "redemara calculatorul."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1930,7 +1996,7 @@ msgstr ""
 "de unul)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1939,12 +2005,12 @@ msgstr ""
 "fi selectată și pornită automat."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Profitați!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2076,6 +2142,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2738,30 +2809,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Rezumatul parametrilor diverși"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2773,18 +2830,40 @@ msgstr ""
 "Puteți verifica parametrii aici, iar dacă doriți îi puteți schimba apăsînd "
 "<guibutton>Configurează</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parametri sistem"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Fus orar</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2795,12 +2874,12 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Țară / Regiune</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2809,35 +2888,35 @@ msgstr ""
 "selecționată. Vedeți <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Încărcător de sistem</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Gestionare utilizatori</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2846,12 +2925,12 @@ msgstr ""
 "director <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Servicii</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2861,7 +2940,7 @@ msgstr ""
 "sarcini."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2870,23 +2949,23 @@ msgstr ""
 "poate împiedica funcționarea corectă a calculatorului."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Parametrii fizici"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastatură</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2894,13 +2973,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Maus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2909,12 +2995,12 @@ msgstr ""
 "tablete, trackball-uri, etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Placă de sunet</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2925,44 +3011,46 @@ msgstr ""
 "pentru acestă placă, însă nici unul dintre ei nu este cel implicit."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Interfață grafică</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Parametrii de rețea și Internet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rețea</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2975,7 +3063,7 @@ msgstr ""
 "încă depozitele mediilor Nonfree."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2984,12 +3072,12 @@ msgstr ""
 "supravegheze și acea interfață."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxyuri</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -3000,7 +3088,7 @@ msgstr ""
 "serviciu de proxy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -3009,17 +3097,17 @@ msgstr ""
 "obține parametrii pe care trebuie să-i introduceți aici."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Securitate"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Nivel de securitate</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3029,18 +3117,18 @@ msgstr ""
 "pentru o utilizare o obișnuită."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Parafoc</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3049,10 +3137,12 @@ msgstr ""
 "escrocii de pe Internet care le-ar putea compromite sau fura."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Selectați serviciile care doriți să aibă acces la sistem. Selecțiile vor "
 "depinde de modul în care utilizați calculatorul."
@@ -3064,26 +3154,39 @@ msgstr ""
 "Țineți cont că poate fi foarte riscant dacă permiteți totul (fără parafoc)."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Repornește"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Odată ce s-a instalat încărcătorul de sistem veți fi invitat să opriți "
+"calculatorul, să îndepărtați mediul de instalare și să reporniți "
+"calculatorul. După repornire veți vedea o succesiune de bare de descărcare "
+"în progresie. Acestea indică faptul că mediile cu aplicații sînt în curs de "
+"descărcare (vedeți capitolul de gestionare a aplicațiilor)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Odată ce s-a instalat încărcătorul de sistem veți fi invitat să opriți "
 "calculatorul, să îndepărtați mediul de instalare și să reporniți "
@@ -3091,6 +3194,16 @@ msgstr ""
 "în progresie. Acestea indică faptul că mediile cu aplicații sînt în curs de "
 "descărcare (vedeți capitolul de gestionare a aplicațiilor)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3151,17 +3264,17 @@ msgstr ""
 "Control Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Selectați și utilizați imaginile ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Introducere"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3170,12 +3283,12 @@ msgstr ""
 "alegeți imaginea care se potrivește nevoilor voastre."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Există două familii de medii:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3190,7 +3303,7 @@ msgstr ""
 "instalați."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3201,22 +3314,22 @@ msgstr ""
 "Procesul de instalare este mai simplu, însă aveți mai puține opțiuni."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Medii"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definiție"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3227,7 +3340,7 @@ msgstr ""
 "care poate fi copiat fișierul ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3236,23 +3349,23 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Mediile de instalare clasice"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Caracteristici comune"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3260,17 +3373,17 @@ msgstr ""
 "o versiune precedentă."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 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:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3279,58 +3392,25 @@ msgstr ""
 "Test de memorie, Unealta de detecție materială"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Vi-se va oferi posibilitatea în timpul instalării să adăugați aplicațiile "
 "proprietare."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD arhitectură duală"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Ambele arhitecturi sînt prezente pe același mediu, alegerea este făcută "
-"automat în funcție de tipul procesorului detectat."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Utilizează doar mediul de birou Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Nu sînt disponibile toate limbile. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) DE VERIFICAT!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Conține aplicații proprietare."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Mediile Live"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3339,18 +3419,20 @@ msgstr ""
 "și opțional să o instalați pe discul dur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, 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:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3361,63 +3443,57 @@ msgstr ""
 "versiunile precedente.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Acestea conțin aplicații proprietare."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "LiveCD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "LiveDVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, 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:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Doar limba engleză."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Doar 32 de biți."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Toate limbile sînt prezente."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "LiveCD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "LiveDVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Doar mediul de birou GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "LiveDVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Toate limbile sînt prezente."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "LiveDVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Doar mediul de birou KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "CD-uri doar pentru demarat"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3431,7 +3507,7 @@ msgstr ""
 "pe Internet."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3442,13 +3518,19 @@ msgstr ""
 "DVD întreg, pentru un calculator fără unitate de DVD sau pentru un "
 "calculator care nu poate demara de pe o cheie USB."
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "Doar limba engleză."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Lansează instalarea"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3457,12 +3539,13 @@ msgstr ""
 "proprietare."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3471,17 +3554,17 @@ msgstr ""
 "persoanele care au nevoie de ele."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Descărcarea și verificarea mediilor"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Descărcare"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3494,12 +3577,12 @@ msgstr ""
 "este prea lentă. Dacă alegeți HTTP, puteți vedea și ceva de genul"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3511,22 +3594,22 @@ msgstr ""
 "această fereastră:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Bifați butonul radio „Salvează fișierul”."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Se verifică integritatea mediului descărcat"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3541,12 +3624,12 @@ 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:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3555,7 +3638,7 @@ msgstr ""
 "to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3564,7 +3647,7 @@ msgstr ""
 "path/to/the/image/file.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3573,17 +3656,17 @@ msgstr ""
 "cu numărul dat de Mageia. Exemplu:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Inscripționați sau copiați imaginea ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3593,12 +3676,12 @@ msgstr ""
 "producă medie de pe care se poate demara."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3612,12 +3695,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3626,7 +3709,7 @@ msgstr ""
 "cheie USB pentru a demara și instala sistemul."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3637,7 +3720,7 @@ msgstr ""
 "pierdute și capacitatea partiției va fi redusă la mărimea fișierului ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3646,12 +3729,12 @@ msgstr ""
 "reformatați cheia USB."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3660,17 +3743,17 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Puteți încerca:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3679,7 +3762,7 @@ msgstr ""
 "utilizînd opțiunea „ISO image\";"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3688,12 +3771,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3702,17 +3785,17 @@ msgstr ""
 "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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Deschideți o consolă"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3721,12 +3804,12 @@ msgstr ""
 "la final '-' )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3735,17 +3818,17 @@ msgstr ""
 "gestionar de fișiere pentru a o citi)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3756,7 +3839,7 @@ msgstr ""
 "emphasis>, sau <emphasis>sdd</emphasis> în acest caz:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3798,7 +3881,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3807,7 +3890,7 @@ msgstr ""
 "<code>/dev/sdb</code> este o cheie USB de 8 Go."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3816,12 +3899,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Unde X=numele dispozitivului, ex: /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3830,37 +3913,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Deconectați cheia USB, ați terminat."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Selectați țara / regiunea"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3870,7 +3953,7 @@ msgstr ""
 "rețelele fără fir."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3879,7 +3962,7 @@ msgstr ""
 "țări</guilabel> și alegeți de acolo țara / regiunea."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3892,21 +3975,20 @@ msgstr ""
 "care ați făcut-o."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Metodă de intrare"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "intrare (la baza listei). Metodele de intrare permit utilizatorilor să scrie "
@@ -3919,10 +4001,11 @@ msgstr ""
 "mediile HTTP/FTP înainte de selecția pachetelor."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Dacă ați omis configurarea metodei de intrare în timpul instalării, o puteți "
@@ -4260,360 +4343,380 @@ msgstr ""
 "șase sau mai multe butoane."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Pentru informații suplimentare despre opțiunile nucleului pe sistemele vechi "
+"și UEFI consultați: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Cu un sistem BIOS"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
-"Puteți adăuga o intrare sau modifica una după ce ați selectat-o, apăsînd pe "
-"butonul corespunzător din ecranul <emphasis>Configurare încărcător de "
-"sistem</emphasis> și editînd intrările din fereastra care se afișează în "
-"acel moment."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Dacă ați ales <code>Grub 2</code> ca încărcător de sistem nu puteți utiliza "
-"această unealtă pentru a edita intrările în această etapă, apăsați "
-"„Înainte”. Va trebui să editați manual <code>/boot/grub2/custom.cfg</code> "
-"sau să utilizați <code>grub-customizer</code>."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Cu un sistem UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr "Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Cu un sistem UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Schimbarea numelui unei intrări și bifarea căsuței pentru a o defini ca "
-"intrare implicită sînt acțiuni care nu comportă nici un risc."
+"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><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Puteți adăuga propriul vostru număr de versiune pentru o intrare, sau o "
-"puteți redenumi în întregime."
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Intrarea implicită este cea pe care sistemul o va demara dacă nu faceți nici "
-"o alegere la pornire."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Editarea altor lucruri vă poate conduce la un sistem nedemarabil. Nu "
-"încercați să testați ceva dacă nu știți ce faceți."
+"Dacă Mageia este primul sistem instalat pe calculator, instalatorul a creat "
+"o ESP (Partiție de Sistem EFI) pentru a găzdui încărcătorul de sistem (Grub2-"
+"efi). Dacă se afla dinainte și un alt sistem de operare UEFI instalat pe "
+"calculator (Windows 8 de exemplu), instalatorul Mageia a detectat partiția "
+"ESP creată de Windows și a adăugat Grub2-efi. Este totuși posibil să aveți "
+"mai multe partiții ESP, însă una este suficientă indiferent de cît de multe "
+"sisteme de operare aveți instalate pe calculator."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Cu un sistem UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Se utilizează un încărcător de sistem Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"În acest caz utilizați Grub2-efi și nu puteți utiliza această unealtă pentru "
-"a edita intrările în această etapă. Pentru a face acest lucru va trebui să "
-"editați manual <code>/boot/grub2/custom.cfg</code> sau mai bine utilizați "
-"<code>grub-customizer</code>. Tot ce puteți face aici este să alegeți "
-"intrarea implicită din lista derulantă."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"După ce apăsați pe butonul <guibutton>Înainte</guibutton> o altă listă "
-"derulantă vă permite să alegeți rezoluția video pentru Grub2 care este un "
-"încărcător grafic de sistem."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
 "imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><info><title>
-#: 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:118
+msgid "Using an existing bootloader"
+msgstr "Se utilizează încărcătorul de sistem existent"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:120
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"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."
+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 "
+"cazurilor, acest lucru implică lansarea programului de instalare al acelui "
+"încărcător de sistem, care ar trebui să detecteze și să adauge automat noul "
+"sistem Mageia. Consultați documentația sistemului de operare în chestiune."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:130
+msgid ""
+"If you don't want a bootable Mageia, but 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>."
+msgstr ""
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"Dacă preferați alți parametri pentru încărcătorul de sistem în locul celor "
-"aleși automatic de instalator, în acest caz îi puteți schimba aici."
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:147
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Dacă aveți deja instalat un alt sistem de operare pe calculator, în acest "
-"caz trebuie să vă decideți ori să adăugați Mageia la încărcătorul de sistem "
-"existent, ori să lăsați Mageia să creeze unul nou."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Meniurile grafice Mageia sînt frumoase:"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Se utilizează un încărcător de sistem Mageia"
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<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."
 msgstr ""
-"Implicit Mageia scrie un nou încărcător de sistem GRUB (învechit) pe MBR "
-"(„Master Boot Record”, sectorul principal de demaraj) de pe primul disc dur. "
-"Dacă aveți deja instalate și alte sisteme de operare, Mageia va încerca să "
-"le adauge în noul meniu de demaraj."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"De asemenea, Mageia propune GRUB2 ca încărcător de sistem opțional în plus "
-"de GRUB (învechit) și Lilo. "
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"Sistemele Linux care utilizează GRUB2 ca încărcător de sistem nu sînt "
-"suportate în momentul de față de GRUB (învechit) și nu vor fi recunoscute "
-"dacă este utilizat încărcătorul de sistem GRUB implicit."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Cea mai bună soluție aici este să utilizați încărcătorul de sistem GRUB2 "
-"care este disponibil în pagina rezumat din cursul instalării."
+"<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><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Se utilizează încărcătorul de sistem existent"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Servicii</guilabel>:"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Dacă ați decis să utilizați un încărcător de sistem existent, atunci va "
-"trebui să nu uitați să VĂ OPRIȚI la pagina rezumat din cursul instalării și "
-"să faceți clic pe butonul <guibutton>Configurează</guibutton> de lîngă "
-"încărcătorul de sistem pentru a schimba locația de instalare a "
-"încărcătorului de sistem. "
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Nu selectați dispozitivul intitulat spre exemplu „sda”, că veți suprascrie "
-"sectorul principal de demaraj (MBR) existent. Trebuie să selectați partiția "
-"rădăcină (/) pe care ați ales-o în etapa de partiționare precedentă (de "
-"exemplu: sda7)."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
 msgstr ""
-"Ca să fie clar: sda este un dispozitiv, iar sda7 este o partiție de pe acel "
-"dispozitiv."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Treceți în terminalul tty2 cu Ctrl+Alt+F2 și tastați <literal>df</literal> "
-"ca să verificați unde se află partiția <literal>/</literal> (rădăcină). Ctrl"
-"+Alt+F7 vă readuce în ecranul instalatorului."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
-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."
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
 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 "
-"cazurilor, acest lucru implică lansarea programului de instalare al acelui "
-"încărcător de sistem, care ar trebui să detecteze și să adauge automat noul "
-"sistem Mageia. Consultați documentația sistemului de operare în chestiune."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Opțiunile avansate ale încărcătorului de sistem"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Dacă dispuneți de un spațiu limitat pe partiția <literal>/</literal>, iar "
-"aceasta conține <literal>/tmp</literal>, faceți clic pe <guibutton>Avansat</"
-"guibutton> și bifați căsuța <guilabel>Curăță /tmp la fiecare pornire</"
-"guilabel>. Acest lucru vă ajută să mențineți ceva spațiu liber."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<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."
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Dacă Mageia este primul sistem instalat pe calculator, instalatorul a creat "
-"o ESP (Partiție de Sistem EFI) pentru a găzdui încărcătorul de sistem (Grub2-"
-"efi). Dacă se afla dinainte și un alt sistem de operare UEFI instalat pe "
-"calculator (Windows 8 de exemplu), instalatorul Mageia a detectat partiția "
-"ESP creată de Windows și a adăugat Grub2-efi. Este totuși posibil să aveți "
-"mai multe partiții ESP, însă una este suficientă indiferent de cît de multe "
-"sisteme de operare aveți instalate pe calculator."
-
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "Nu modificați „Dispozitivul de demaraj” doar dacă știți ce faceți."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4663,22 +4766,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX va putea atunci să le configureze corect."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Configurare sunet"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4688,7 +4792,7 @@ msgstr ""
 "placa de sunet, care va fi cel implicit dacă există unul."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4704,7 +4808,7 @@ msgstr ""
 "ecranului."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4715,12 +4819,12 @@ msgstr ""
 "pentru a găsi sfaturi utile despre cum să rezolvați problema."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avansat"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4731,7 +4835,7 @@ msgstr ""
 "disponibili și credeți că instalatorul l-a selecționat pe cel greșit. "
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4903,12 +5007,12 @@ msgid "Uninstalling Mageia"
 msgstr "Dezinstalare Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Îndrumar"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4920,7 +5024,7 @@ msgstr ""
 "sistemele de operare."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4932,7 +5036,7 @@ msgstr ""
 "alegeți sistemul de operare."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4951,7 +5055,7 @@ msgstr ""
 "guibutton>. Spațiul va fi eliberat."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4960,7 +5064,7 @@ msgstr ""
 "(FAT32 sau NTFS). Aceasta va primi o literă de partiție."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -5020,3 +5124,311 @@ msgstr ""
 "Următoarea etapă este copierea fișierelor pe discul dur. Acest lucru poate "
 "dura cîteva minute bune. La sfîrșit veți avea un ecran alb pentru cîteva "
 "momente, este normal."
+
+#~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Totuși, după instalare, orice utilizator adăugat cu <emphasis>MCC - "
+#~ "Sistem - Gestionați utilizatorii din sistem</emphasis> vor avea un "
+#~ "director personal protejat atît la citire cît și la scriere."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Dacă nu doriți un director personal accesibil în citire de toată lumea, "
+#~ "este recomandat să adăugați acum doar un utilizator temporar și să-i "
+#~ "adăugați pe cei adevărați după repornire."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD arhitectură duală"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Ambele arhitecturi sînt prezente pe același mediu, alegerea este făcută "
+#~ "automat în funcție de tipul procesorului detectat."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Utilizează doar mediul de birou Xfce."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Nu sînt disponibile toate limbile. (be, bg, ca, de, en, es, fr, it, mk, "
+#~ "pl, pt, ru, sv, uk) DE VERIFICAT!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Conține aplicații proprietare."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "LiveCD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Doar 32 de biți."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "LiveCD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Cu un sistem BIOS"
+
+#~ 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."
+#~ msgstr ""
+#~ "Puteți adăuga o intrare sau modifica una după ce ați selectat-o, apăsînd "
+#~ "pe butonul corespunzător din ecranul <emphasis>Configurare încărcător de "
+#~ "sistem</emphasis> și editînd intrările din fereastra care se afișează în "
+#~ "acel moment."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Dacă ați ales <code>Grub 2</code> ca încărcător de sistem nu puteți "
+#~ "utiliza această unealtă pentru a edita intrările în această etapă, "
+#~ "apăsați „Înainte”. Va trebui să editați manual <code>/boot/grub2/custom."
+#~ "cfg</code> sau să utilizați <code>grub-customizer</code>."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Schimbarea numelui unei intrări și bifarea căsuței pentru a o defini ca "
+#~ "intrare implicită sînt acțiuni care nu comportă nici un risc."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Puteți adăuga propriul vostru număr de versiune pentru o intrare, sau o "
+#~ "puteți redenumi în întregime."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Intrarea implicită este cea pe care sistemul o va demara dacă nu faceți "
+#~ "nici o alegere la pornire."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Editarea altor lucruri vă poate conduce la un sistem nedemarabil. Nu "
+#~ "încercați să testați ceva dacă nu știți ce faceți."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "În acest caz utilizați Grub2-efi și nu puteți utiliza această unealtă "
+#~ "pentru a edita intrările în această etapă. Pentru a face acest lucru va "
+#~ "trebui să editați manual <code>/boot/grub2/custom.cfg</code> sau mai bine "
+#~ "utilizați <code>grub-customizer</code>. Tot ce puteți face aici este să "
+#~ "alegeți intrarea implicită din lista derulantă."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "După ce apăsați pe butonul <guibutton>Înainte</guibutton> o altă listă "
+#~ "derulantă vă permite să alegeți rezoluția video pentru Grub2 care este un "
+#~ "încărcător grafic de sistem."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Dacă preferați alți parametri pentru încărcătorul de sistem în locul "
+#~ "celor aleși automatic de instalator, în acest caz îi puteți schimba aici."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Dacă aveți deja instalat un alt sistem de operare pe calculator, în acest "
+#~ "caz trebuie să vă decideți ori să adăugați Mageia la încărcătorul de "
+#~ "sistem existent, ori să lăsați Mageia să creeze unul nou."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Implicit Mageia scrie un nou încărcător de sistem GRUB (învechit) pe MBR "
+#~ "(„Master Boot Record”, sectorul principal de demaraj) de pe primul disc "
+#~ "dur. Dacă aveți deja instalate și alte sisteme de operare, Mageia va "
+#~ "încerca să le adauge în noul meniu de demaraj."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "De asemenea, Mageia propune GRUB2 ca încărcător de sistem opțional în "
+#~ "plus de GRUB (învechit) și Lilo. "
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Sistemele Linux care utilizează GRUB2 ca încărcător de sistem nu sînt "
+#~ "suportate în momentul de față de GRUB (învechit) și nu vor fi recunoscute "
+#~ "dacă este utilizat încărcătorul de sistem GRUB implicit."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Cea mai bună soluție aici este să utilizați încărcătorul de sistem GRUB2 "
+#~ "care este disponibil în pagina rezumat din cursul instalării."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Dacă ați decis să utilizați un încărcător de sistem existent, atunci va "
+#~ "trebui să nu uitați să VĂ OPRIȚI la pagina rezumat din cursul instalării "
+#~ "și să faceți clic pe butonul <guibutton>Configurează</guibutton> de lîngă "
+#~ "încărcătorul de sistem pentru a schimba locația de instalare a "
+#~ "încărcătorului de sistem. "
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Nu selectați dispozitivul intitulat spre exemplu „sda”, că veți "
+#~ "suprascrie sectorul principal de demaraj (MBR) existent. Trebuie să "
+#~ "selectați partiția rădăcină (/) pe care ați ales-o în etapa de "
+#~ "partiționare precedentă (de exemplu: sda7)."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Ca să fie clar: sda este un dispozitiv, iar sda7 este o partiție de pe "
+#~ "acel dispozitiv."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Treceți în terminalul tty2 cu Ctrl+Alt+F2 și tastați <literal>df</"
+#~ "literal> ca să verificați unde se află partiția <literal>/</literal> "
+#~ "(rădăcină). Ctrl+Alt+F7 vă readuce în ecranul instalatorului."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Opțiunile avansate ale încărcătorului de sistem"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Dacă dispuneți de un spațiu limitat pe partiția <literal>/</literal>, iar "
+#~ "aceasta conține <literal>/tmp</literal>, faceți clic pe "
+#~ "<guibutton>Avansat</guibutton> și bifați căsuța <guilabel>Curăță /tmp la "
+#~ "fiecare pornire</guilabel>. Acest lucru vă ajută să mențineți ceva spațiu "
+#~ "liber."
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 0c82f3cf..46a6706a 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
-# 
+#
 # Translators:
 # AlexL <loginov.alex.valer@gmail.com>, 2013,2016
 # angry_snake <inactive+angry_snake@transifex.com>, 2014
@@ -17,15 +17,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-11-04 13:11+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/ru/)\n"
+"Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
+"ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -36,11 +39,16 @@ msgstr "Условия лицензирования и заметки о вып�
 #: 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>"
-msgstr "<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>"
+"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 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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:40
@@ -50,31 +58,40 @@ 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."
-msgstr "Перед установкой <application>Mageia</application> ознакомьтесь с условиями лицензирования."
+"Before installing <application>Mageia</application>, please read the license "
+"terms and conditions carefully."
+msgstr ""
+"Перед установкой <application>Mageia</application> ознакомьтесь с условиями "
+"лицензирования."
 
 #. 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."
-msgstr "Эти условия лицензирования касаются всего дистрибутива <application>Mageia</application>. Вам следует принять эти условия, иначе установка будет невозможна."
+"These terms and conditions apply to the entire <application>Mageia</"
+"application> distribution and must be accepted before you can continue."
+msgstr ""
+"Эти условия лицензирования касаются всего дистрибутива <application>Mageia</"
+"application>. Вам следует принять эти условия, иначе установка будет "
+"невозможна."
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
 msgid ""
 "To accept, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
-msgstr "Чтобы согласиться с условиями, отметьте пункт <guilabel>Принять</guilabel>, а потом нажмите кнопку <guibutton>Далее</guibutton>."
+msgstr ""
+"Чтобы согласиться с условиями, отметьте пункт <guilabel>Принять</guilabel>, "
+"а потом нажмите кнопку <guibutton>Далее</guibutton>."
 
 #. 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."
-msgstr "Если вы не согласны с условиями лицензионного соглашения, мы будем благодарны за то, что вы обратили внимание на наш дистрибутив. После нажатия кнопки <guibutton>Выйти</guibutton> ваш компьютер будет перезагружен."
+"If you decide not to accept these conditions, then we thank you for looking. "
+"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+msgstr ""
+"Если вы не согласны с условиями лицензионного соглашения, мы будем "
+"благодарны за то, что вы обратили внимание на наш дистрибутив. После нажатия "
+"кнопки <guibutton>Выйти</guibutton> ваш компьютер будет перезагружен."
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:63
@@ -84,10 +101,12 @@ 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."
-msgstr "Чтобы ознакомиться со списком нововведений в <application>Mageia</application>, нажмите кнопку <guibutton>Заметки о выпуске</guibutton>."
+"Important information are given about this release of <application>Mageia</"
+"application> and are accessible 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
@@ -98,34 +117,41 @@ msgstr "ru"
 #. type: Content of: <section><info><title>
 #: en/add_supplemental_media.xml:10
 msgid "Media Selection (Configure Supplemental Installation Media)"
-msgstr "Выбор носителя (настройки дополнительных носителей пакетов для установки)"
+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
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </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
 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 "
+"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."
-msgstr "На этой странице будет представлен список определенных репозиториев пакетов. Вы сможете добавить другие источники пакетов, в частности оптический носитель или удаленный сервер сети. Набор указанных репозиториев определяет, какие из пакетов будут доступны для выбора на последующих шагах."
+msgstr ""
+"На этой странице будет представлен список определенных репозиториев пакетов. "
+"Вы сможете добавить другие источники пакетов, в частности оптический "
+"носитель или удаленный сервер сети. Набор указанных репозиториев определяет, "
+"какие из пакетов будут доступны для выбора на последующих шагах."
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:29
 msgid "For a network source, there are two steps to follow:"
-msgstr "Чтобы добавить сетевой источник, необходимо выполнить два следующих шага:"
+msgstr ""
+"Чтобы добавить сетевой источник, необходимо выполнить два следующих шага:"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/add_supplemental_media.xml:33
@@ -140,7 +166,13 @@ msgid ""
 "Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
 "the URL, you can designate a specific repository or your own NFS "
 "installation."
-msgstr "Выбор зеркала или определение URL-адреса (первая запись). После выбора зеркала вы получите доступ к выбору всех репозиториев, которые используются в Mageia, в частности к репозиторию несвободных пакетов, к репозиторию пакетов с ограничениями в лицензировании и к репозиторию обновлений. С помощью URL-адреса можно связать с системой определенный репозиторий пакетов или развернутую вами с помощью NFS систему."
+msgstr ""
+"Выбор зеркала или определение URL-адреса (первая запись). После выбора "
+"зеркала вы получите доступ к выбору всех репозиториев, которые используются "
+"в Mageia, в частности к репозиторию несвободных пакетов, к репозиторию "
+"пакетов с ограничениями в лицензировании и к репозиторию обновлений. С "
+"помощью URL-адреса можно связать с системой определенный репозиторий пакетов "
+"или развернутую вами с помощью NFS систему."
 
 #. type: Content of: <section><note><para>
 #: en/add_supplemental_media.xml:46
@@ -151,238 +183,281 @@ msgid ""
 "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."
-msgstr "Если вы обновляете 64-битную версию системы, где могут содержаться какие-то 32-битные пакеты, вам стоит воспользоваться этой страницей для добавления хранилища пакетов: обозначьте один из протоколов сети. DVD с 64-битной версией содержит только 64-битные пакеты и пакеты без определенной архитектуры. С его помощью нельзя обновить 32-битные пакеты. Впрочем, после добавления интернет-хранилища, средство установки может обнаружить нужные для обновления 32-битные пакеты."
+msgstr ""
+"Если вы обновляете 64-битную версию системы, где могут содержаться какие-то "
+"32-битные пакеты, вам стоит воспользоваться этой страницей для добавления "
+"хранилища пакетов: обозначьте один из протоколов сети. DVD с 64-битной "
+"версией содержит только 64-битные пакеты и пакеты без определенной "
+"архитектуры. С его помощью нельзя обновить 32-битные пакеты. Впрочем, после "
+"добавления интернет-хранилища, средство установки может обнаружить нужные "
+"для обновления 32-битные пакеты."
 
 #. type: Content of: <section><info><title>
 #: en/addUser.xml:3
 msgid "User and Superuser Management"
 msgstr "Управление учётными записями пользователя и администратора"
 
-#.  Started by marja,using Led43's text, on 2012 03 27
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, finished the page using Led43's text in the wiki,
-#. but
-#.        changed his text about the Advanced User Managment screen (the only
-#. thing
-#.        about guest account there, is the box you can tick or untick to
-#. enable or
-#.        disable it, the rest is about the normal user you're adding in the
-#. previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't
-#. understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" "
-"align=\"center\" xml:id=\"setRootPassword-im1\" "
-"fileref=\"dx2-setRootPassword.png\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata format=\"PNG\" fileref=\"live-user1.png\"/> "
-"</imageobject>"
-msgstr "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align=\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png\" format=\"PNG\"/> </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 ""
+"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
+"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
+"\" format=\"PNG\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" "
+"fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Восстановление пароля администратора (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
+"<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 "
 "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."
-msgstr "В каждой установленной системе <application>Mageia</application> следует определить пароль суперпользователя или администратора. Такой пароль в Linux обычно называется <emphasis>пароль root</emphasis>. При вводе пароля цвет отметки защищенности должны меняться с красного на жёлтый, а затем на зелёный в зависимости от сложности пароля. Зелёный цвет соответствует достаточно сложным паролям. Вам также следует повторить ввод пароля в поле, расположенном ниже, чтобы удостовериться, что пароль был введён без ошибок."
+msgstr ""
+"В каждой установленной системе <application>Mageia</application> следует "
+"определить пароль суперпользователя или администратора. Такой пароль в Linux "
+"обычно называется <emphasis>пароль root</emphasis>. При вводе пароля цвет "
+"отметки защищенности должны меняться с красного на жёлтый, а затем на "
+"зелёный в зависимости от сложности пароля. Зелёный цвет соответствует "
+"достаточно сложным паролям. Вам также следует повторить ввод пароля в поле, "
+"расположенном ниже, чтобы удостовериться, что пароль был введён без ошибок."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
-msgstr "Все пароли следует указывать с учетом регистра. Лучше использовать в пароле смесь букв (большие и маленькие), цифры и другие символы."
+msgstr ""
+"Все пароли следует указывать с учетом регистра. Лучше использовать в пароле "
+"смесь букв (большие и маленькие), цифры и другие символы."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Введите пользователя"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
 "anything else the average user does with his computer"
-msgstr "С помощью этой панели вы можете добавить пользователей. Каждый пользователь имеет меньшие права доступа, чем суперпользователь (root), но достаточно прав для просмотра интернета, пользования офисными программами, для игр и любых других задач, которые выполняются обычным пользователем за компьютером."
+msgstr ""
+"С помощью этой панели вы можете добавить пользователей. Каждый пользователь "
+"имеет меньшие права доступа, чем суперпользователь (root), но достаточно "
+"прав для просмотра интернета, пользования офисными программами, для игр и "
+"любых других задач, которые выполняются обычным пользователем за компьютером."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
-msgstr "<guibutton>Иконка</guibutton>: с помощью этой кнопки можно изменить значок пользователя."
+msgstr ""
+"<guibutton>Иконка</guibutton>: с помощью этой кнопки можно изменить значок "
+"пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
-msgstr "<guilabel>Имя</guilabel>: в этом поле следует указать настоящее имя пользователя."
+msgstr ""
+"<guilabel>Имя</guilabel>: в этом поле следует указать настоящее имя "
+"пользователя."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case"
-" sensitive.</emphasis>"
-msgstr "<guilabel>Имя пользователя</guilabel>: здесь вы можете ввести регистрационное имя пользователя или предоставить возможность drakx использовать определенную версию настоящего имени. <emphasis>Имя пользователя чувствительно к регистру.</emphasis>"
+"drakx use a version of the users real name. <emphasis>The login name is case "
+"sensitive.</emphasis>"
+msgstr ""
+"<guilabel>Имя пользователя</guilabel>: здесь вы можете ввести "
+"регистрационное имя пользователя или предоставить возможность drakx "
+"использовать определенную версию настоящего имени. <emphasis>Имя "
+"пользователя чувствительно к регистру.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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\"/>)"
-msgstr "<guilabel>Пароль</guilabel>: в этом поле вам следует указать пароль. Цвет отметки защищенности рядом с полем соответствует сложности пароля (см. также <xref linkend=\"givePassword\"/>)"
+msgstr ""
+"<guilabel>Пароль</guilabel>: в этом поле вам следует указать пароль. Цвет "
+"отметки защищенности рядом с полем соответствует сложности пароля (см. также "
+"<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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."
-msgstr "<guilabel>Пароль (еще раз)</guilabel>: повторите ввод пароля в этом поле. DrakX проверит, совпадает ли  введенный повторно пароль с его первоначальным вариантом."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
-msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
-msgstr "Содержание домашних каталогов всех пользователей, учетные записи которых будут созданы при установке Mageia, сможет читать любой пользователь (но не записывать в эти каталоги данные)."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr "Впрочем, после установки домашние каталоги пользователей, учетные записи которых будут добавлены через <emphasis> Центр управления Mageia - Система - Управление пользователями </emphasis>, будут защищены как от чтения, так и от записи."
+"text box and drakx will check you have the same password in each of the user "
+"password text boxes."
+msgstr ""
+"<guilabel>Пароль (еще раз)</guilabel>: повторите ввод пароля в этом поле. "
+"DrakX проверит, совпадает ли  введенный повторно пароль с его первоначальным "
+"вариантом."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr "Если вы хотите защитить ваш домашний каталог от чтения для конкретного пользователя, то вам стоит на этапе установки создать временного пользователя, а настоящего создать уже после завершения установки и перезагрузки системы."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
+msgstr ""
+"Содержание домашних каталогов всех пользователей, учетные записи которых "
+"будут созданы при установке Mageia, сможет читать любой пользователь (но не "
+"записывать в эти каталоги данные)."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
-msgstr "Если вы предпочитаете домашние каталоги пользователей, содержание которых будет доступно всем другим пользователям, то вам стоит добавить всех будущих пользователей системы на шаге <emphasis> Настройки - Резюме </emphasis> при установке системы. Для управления записями выберите <emphasis> Управление пользователями </emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
+msgstr ""
+"Если вы предпочитаете домашние каталоги пользователей, содержание которых "
+"будет доступно всем другим пользователям, то вам стоит добавить всех будущих "
+"пользователей системы на шаге <emphasis> Настройки - Резюме </emphasis> при "
+"установке системы. Для управления записями выберите <emphasis> Управление "
+"пользователями </emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 msgid "The access permissions can also be changed after the install."
-msgstr "Права доступа к домашним каталогам, конечно же, можно изменить и после завершения установки системы."
+msgstr ""
+"Права доступа к домашним каталогам, конечно же, можно изменить и после "
+"завершения установки системы."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Дополнительные возможности управления учетными записями пользователей"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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 "Если вы нажмете кнопку <guibutton>Дополнительно</guibutton>, то программа откроет диалоговое окно, с помощью которого вы сможете изменить параметры учетной записи, которую вы добавляете."
+msgstr ""
+"Если вы нажмете кнопку <guibutton>Дополнительно</guibutton>, то программа "
+"откроет диалоговое окно, с помощью которого вы сможете изменить параметры "
+"учетной записи, которую вы добавляете."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr "Кроме того, вы можете отключить или включить учётную запись гостя."
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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, будут потеряны при выходе из системы. Пользователю гостевого аккаунта следует позаботиться о сохранении важных файлов на портативный носитель данных."
+msgstr ""
+"Любые данные, которые будут записаны с гостевого аккаунта <emphasis>rbash</"
+"emphasis> в соответствующий каталог в /home, будут потеряны при выходе из "
+"системы. Пользователю гостевого аккаунта следует позаботиться о сохранении "
+"важных файлов на портативный носитель данных."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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>: с помощью этого пункта можно включить или отключить гостевой аккаунт. Пользователь гостевого аккаунта сможет войти в систему, пользоваться компьютером, но будет иметь ограниченные права доступа даже по сравнению с обычными пользователями."
+msgstr ""
+"<guilabel>Включить гостевой аккаунт</guilabel>: с помощью этого пункта можно "
+"включить или отключить гостевой аккаунт. Пользователь гостевого аккаунта "
+"сможет войти в систему, пользоваться компьютером, но будет иметь "
+"ограниченные права доступа даже по сравнению с обычными пользователями."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "<guilabel>Командная оболочка</guilabel>: с помощью этого раскрывающегося списка вы можете изменить командную оболочку, которая будет использоваться для работы пользователя. Возможны следующие варианты: Bash, Dash и Sh."
+msgstr ""
+"<guilabel>Командная оболочка</guilabel>: с помощью этого раскрывающегося "
+"списка вы можете изменить командную оболочку, которая будет использоваться "
+"для работы пользователя. Возможны следующие варианты: Bash, Dash и Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "<guilabel>Код пользователя</guilabel>: здесь вы можете установить код (идентификатор) пользователя, имя которого было добавлено с помощью предыдущего окна. Следует указать номер аккаунта. Не заполняйте это поле, если вам неизвестны последствия ваших действий."
+msgstr ""
+"<guilabel>Код пользователя</guilabel>: здесь вы можете установить код "
+"(идентификатор) пользователя, имя которого было добавлено с помощью "
+"предыдущего окна. Следует указать номер аккаунта. Не заполняйте это поле, "
+"если вам неизвестны последствия ваших действий."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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>: здесь вы можете установить код (идентификатор) группы пользователя. Следует указать номер, обычно тот же, что и для учетной записи пользователя. Не заполняйте это поле, если вам неизвестны последствия ваших действий."
+"number, usually the same one as for the user. Leave it blank unless you know "
+"what you are doing."
+msgstr ""
+"<guilabel>Код группы</guilabel>: здесь вы можете установить код "
+"(идентификатор) группы пользователя. Следует указать номер, обычно тот же, "
+"что и для учетной записи пользователя. Не заполняйте это поле, если вам "
+"неизвестны последствия ваших действий."
 
 #. type: Content of: <section><info><title>
 #: en/ask_mntpoint_s.xml:11
 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>"
-msgstr "<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 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>"
+msgstr ""
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -390,46 +465,64 @@ msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
 "can change the mount points."
-msgstr "С помощью этой страницы вы можете просмотреть список разделов Linux на вашем компьютере. Если вы не согласны с предложениями <application>DrakX</application>, вы можете заменить точки монтирования."
+msgstr ""
+"С помощью этой страницы вы можете просмотреть список разделов Linux на вашем "
+"компьютере. Если вы не согласны с предложениями <application>DrakX</"
+"application>, вы можете заменить точки монтирования."
 
 #. type: Content of: <section><note><para>
 #: en/ask_mntpoint_s.xml:42
 msgid ""
 "If you change anything, make sure you still have a <literal>/</literal> "
 "(root) partition."
-msgstr "В случае внесения изменений не забудьте, что среди разделов обязательно должен быть корневой раздел <literal>/</literal>."
+msgstr ""
+"В случае внесения изменений не забудьте, что среди разделов обязательно "
+"должен быть корневой раздел <literal>/</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:48
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount "
-"point\", \"Type\")."
-msgstr "Для каждого из разделов будут показаны такие данные: «Устройство» («Ёмкость», «Точка монтированния», «Тип»)."
+"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
+"\", \"Type\")."
+msgstr ""
+"Для каждого из разделов будут показаны такие данные: "
+"«Устройство» («Ёмкость», «Точка монтированния», «Тип»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:53
 msgid ""
 "\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
 "\"partition number\" (for example, \"sda5\")."
-msgstr "Для пункта «Устройство» будет показано следующее: «жесткий диск», [«номер жесткого диска» (буква)], «номер раздела» (например, «sda5»)."
+msgstr ""
+"Для пункта «Устройство» будет показано следующее: «жесткий диск», [«номер "
+"жесткого диска» (буква)], «номер раздела» (например, «sda5»)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:59
 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> "
+"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."
-msgstr "Если в системе много разделов, с помощью выпадающего меню вы сможете выбрать для них разные точки монтирования, в частности такие: <literal>/</literal>, <literal>/home</literal> и <literal>/var</literal>. Кроме того, вы можете создать собственные точки монтирования, например <literal>/video</literal> раздела, на котором будут храниться ваши видео файлы или <literal>/cauldron-home</literal> для раздела <literal>/home</literal> установленной тестовой версии (cauldron)."
+"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
+"literal> partition of a cauldron install."
+msgstr ""
+"Если в системе много разделов, с помощью выпадающего меню вы сможете выбрать "
+"для них разные точки монтирования, в частности такие: <literal>/</literal>, "
+"<literal>/home</literal> и <literal>/var</literal>. Кроме того, вы можете "
+"создать собственные точки монтирования, например <literal>/video</literal> "
+"раздела, на котором будут храниться ваши видео файлы или <literal>/cauldron-"
+"home</literal> для раздела <literal>/home</literal> установленной тестовой "
+"версии (cauldron)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:69
 msgid ""
 "For partitions you don't need to have access to, you can leave the mount "
 "point field blank."
-msgstr "Для разделов, доступ к которым в установленной системе не будет осуществляться, вы можете не указывать точку монтирования."
+msgstr ""
+"Для разделов, доступ к которым в установленной системе не будет "
+"осуществляться, вы можете не указывать точку монтирования."
 
 #. type: Content of: <section><warning><para>
 #: en/ask_mntpoint_s.xml:75
@@ -437,15 +530,23 @@ 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."
-msgstr "Нажмите кнопку <guibutton>Назад</guibutton>, если вы не уверены с выбором. Нажмите кнопку <guilabel>Специальное разбиение диска</guilabel>. В окне, которое будет открыто в ответ, вы сможете выбрать область раздела, чтобы просмотреть данные по типу и размеру раздела."
+msgstr ""
+"Нажмите кнопку <guibutton>Назад</guibutton>, если вы не уверены с выбором. "
+"Нажмите кнопку <guilabel>Специальное разбиение диска</guilabel>. В окне, "
+"которое будет открыто в ответ, вы сможете выбрать область раздела, чтобы "
+"просмотреть данные по типу и размеру раздела."
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:81
 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."
-msgstr "Если вы уверены, что точки монтирования определены правильно, нажмите кнопку <guibutton>Далее</guibutton> и определитесь с тем, следует ли только форматировать разделы согласно предложению DrakX или следует выполнить дополнительные действия."
+"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 ""
+"Если вы уверены, что точки монтирования определены правильно, нажмите кнопку "
+"<guibutton>Далее</guibutton> и определитесь с тем, следует ли только "
+"форматировать разделы согласно предложению DrakX или следует выполнить "
+"дополнительные действия."
 
 #. type: Content of: <section><info><title>
 #: en/bestTime.xml:10
@@ -457,19 +558,24 @@ msgstr "Настройки часов"
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
 msgid ""
 "In this step, you have to select on which time your internal clock is set, "
 "either local time or UTC time."
-msgstr "На этом шаге вы должны выбрать, на какое время устанавливаются ваши внутренние часы, либо местное время, либо время UTC."
+msgstr ""
+"На этом шаге вы должны выбрать, на какое время устанавливаются ваши "
+"внутренние часы, либо местное время, либо время UTC."
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:23
 msgid "In advanced tab, you will find more options about clock settings."
-msgstr "На вкладке Дополнительно, вы найдёте больше вариантов о настройках часов."
+msgstr ""
+"На вкладке Дополнительно, вы найдёте больше вариантов о настройках часов."
 
 #. type: Content of: <section><info><title>
 #: en/bootLive.xml:1
@@ -490,19 +596,28 @@ 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."
-msgstr "Вы можете загрузиться непосредственно с носителя, который вы использовали, чтобы прожечь ваш образ (CD-ROM, DVD-ROM...). Вам, как правило, нужно просто вставить его в CD/DVD привод для загрузчика, чтобы автоматически запустить установку после перезагрузки компьютера. Если этого не произойдёт, то вам возможно потребуется изменить настройки BIOS или нажать определённую клавишу, которая предложит вам выбрать периферийное устройство, с которого компьютер будет загружаться."
+msgstr ""
+"Вы можете загрузиться непосредственно с носителя, который вы использовали, "
+"чтобы прожечь ваш образ (CD-ROM, DVD-ROM...). Вам, как правило, нужно просто "
+"вставить его в CD/DVD привод для загрузчика, чтобы автоматически запустить "
+"установку после перезагрузки компьютера. Если этого не произойдёт, то вам "
+"возможно потребуется изменить настройки BIOS или нажать определённую "
+"клавишу, которая предложит вам выбрать периферийное устройство, с которого "
+"компьютер будет загружаться."
 
 #. type: Content of: <section><section><section><para>
 #: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
-msgstr "В соответствии аппаратными средствами, которые вы имеете, и как они настроены, вы получаете либо один, либо другой из двух экранов ниже."
+msgstr ""
+"В соответствии аппаратными средствами, которые вы имеете, и как они "
+"настроены, вы получаете либо один, либо другой из двух экранов ниже."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/bootLive.xml:7
@@ -517,7 +632,13 @@ msgid ""
 "USB device already plugged in a port. If that does not happen you may need "
 "to reconfigure your BIOS or press one key that will offer you to choose the "
 "peripheral from which the computer will boot."
-msgstr "Вы можете загрузиться с устройства USB, на которое вы сбрасывали свой образ ISO. В соответствии с вашими настройками BIOS компьютер возможно загружается непосредственно с устройства USB, которое уже подключено к порту. Если это не произойдёт, вам возможно потребуется изменить настройки BIOS или нажать определённую клавишу, которая предложит вам выбрать периферийное устройство, с которого компьютер будет загружаться."
+msgstr ""
+"Вы можете загрузиться с устройства USB, на которое вы сбрасывали свой образ "
+"ISO. В соответствии с вашими настройками BIOS компьютер возможно загружается "
+"непосредственно с устройства USB, которое уже подключено к порту. Если это "
+"не произойдёт, вам возможно потребуется изменить настройки BIOS или нажать "
+"определённую клавишу, которая предложит вам выбрать периферийное устройство, "
+"с которого компьютер будет загружаться."
 
 #. type: Content of: <section><section><info><title>
 #: en/bootLive.xml:12
@@ -527,7 +648,8 @@ msgstr "В режиме BIOS/CSM/Legacy"
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -542,17 +664,23 @@ msgstr "В среднем меню у вас есть выбор между тр
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:13
 msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD"
-" or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard"
-" disk."
-msgstr "Загрузить Mageia: Это означает, что Mageia 5 запустится с подключенного носителя (CD/DVD или USB флэш диска) без записи на диск, поэтому стоит ожидать очень медленную систему. После завершения загрузки вы можете приступить к установке на жёсткий диск."
+"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
+"or USB stick) without writing anything on the disk, so expect a very slow "
+"system. Once the boot is done, you can proceed to the installation on a hard "
+"disk."
+msgstr ""
+"Загрузить Mageia: Это означает, что Mageia 5 запустится с подключенного "
+"носителя (CD/DVD или USB флэш диска) без записи на диск, поэтому стоит "
+"ожидать очень медленную систему. После завершения загрузки вы можете "
+"приступить к установке на жёсткий диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
-msgstr "Установить Mageia: Этот выбор приведёт к непосредственной установке Mageia на жёсткий диск."
+msgstr ""
+"Установить Mageia: Этот выбор приведёт к непосредственной установке Mageia "
+"на жёсткий диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:17
@@ -560,7 +688,10 @@ msgid ""
 "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
 "when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
 "5)."
-msgstr "Загрузка с жёсткого диска: Этот выбор позволяет загружаться с жёсткого диска как обычно, когда никакие носители информации (CD/DVD или USB флэш диски) не подключены. (не работает с Mageia 5)."
+msgstr ""
+"Загрузка с жёсткого диска: Этот выбор позволяет загружаться с жёсткого диска "
+"как обычно, когда никакие носители информации (CD/DVD или USB флэш диски) не "
+"подключены. (не работает с Mageia 5)."
 
 #. type: Content of: <section><section><para>
 #: en/bootLive.xml:19
@@ -569,7 +700,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 "F1 - Справка. Объясняются опции \"splash\", \"apm\", \"acpi\" и\"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
@@ -579,9 +711,9 @@ msgstr "F2 - Язык. Выбирается отображаемый на экр
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:21
-msgid ""
-"F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
-msgstr "F3 - Разрешение экрана. Выбирается между текстом, 640x400, 800x600, 1024x728"
+msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+msgstr ""
+"F3 - Разрешение экрана. Выбирается между текстом, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:22
@@ -591,7 +723,12 @@ msgid ""
 "NFS servers. If the installation is carried out in a network with an SLP "
 "server, select one of the installation sources available on the server with "
 "this option."
-msgstr "F4 - CD-Rom. CD-Rom или другой. Как правило, установка производится с вставленного установочного носителя. Здесь выбираются другие источники, такие как серверы FTP или NFS. Если установка выполняется по сети с сервера SLP, то с помощью этой опции выберите один из источников установки, доступный на сервере."
+msgstr ""
+"F4 - CD-Rom. CD-Rom или другой. Как правило, установка производится с "
+"вставленного установочного носителя. Здесь выбираются другие источники, "
+"такие как серверы FTP или NFS. Если установка выполняется по сети с сервера "
+"SLP, то с помощью этой опции выберите один из источников установки, "
+"доступный на сервере."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:26
@@ -599,14 +736,18 @@ msgid ""
 "F5 - Driver. Yes or No. The system is aware about the presence of an "
 "optional disk with a driver update and will require its insertion during "
 "installation process."
-msgstr "F5 - Драйвер. Да или Нет. Система знает о наличии оптического диска с обновлением драйверов и потребует его вставки во время процесса установки."
+msgstr ""
+"F5 - Драйвер. Да или Нет. Система знает о наличии оптического диска с "
+"обновлением драйверов и потребует его вставки во время процесса установки."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
-msgstr "F6 - Параметры ядра. Это способ указать параметры в соответствии с вашим оборудованием и драйверами для использования."
+msgstr ""
+"F6 - Параметры ядра. Это способ указать параметры в соответствии с вашим "
+"оборудованием и драйверами для использования."
 
 #. type: Content of: <section><section><info><title>
 #: en/bootLive.xml:29
@@ -618,7 +759,9 @@ msgstr "В режиме UEFI"
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
-msgstr "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
+msgstr ""
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -630,7 +773,9 @@ msgstr "Первый экран при загрузке с диска для с�
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
-msgstr "У вас есть только выбор для запуска Mageia в Live режиме (первый вариант) или инициировать установку (второй вариант)."
+msgstr ""
+"У вас есть только выбор для запуска Mageia в Live режиме (первый вариант) "
+"или инициировать установку (второй вариант)."
 
 #. type: Content of: <section><section><para>
 #: en/bootLive.xml:30
@@ -638,45 +783,59 @@ msgid ""
 "If you booted from a USB stick, you get two supplemental lines which are a "
 "duplicata of the previous lines suffixed with \"USB\". You have to choose "
 "them."
-msgstr "Если вы загрузились с USB флешки, вы получите две дополнительные строки, которые являются дубликатами предыдущих строк с суффиксом \"USB\". Вы должны выбрать их."
+msgstr ""
+"Если вы загрузились с USB флешки, вы получите две дополнительные строки, "
+"которые являются дубликатами предыдущих строк с суффиксом \"USB\". Вы должны "
+"выбрать их."
 
 #. type: Content of: <section><section><para>
 #: 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>."
-msgstr "В каждом случае первые шаги будут такими же, чтобы выбрать язык, часовой пояс и клавиатуру, а затем процессы будут различаться на <link linkend=\"testing\">дополнительные шаги в Live режиме</link>."
+"and keyboard, then the processes differ, with <link linkend=\"testing"
+"\">additional steps in Live mode</link>."
+msgstr ""
+"В каждом случае первые шаги будут такими же, чтобы выбрать язык, часовой "
+"пояс и клавиатуру, а затем процессы будут различаться на <link linkend="
+"\"testing\">дополнительные шаги в Live режиме</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Выбор рабочего стола"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine"
-" tune your choice."
-msgstr "В зависимости от выбранного вами с помощью этой страницы варианта установки, программа может предложить на последующих страницах дополнительные возможности окончательной настройки вашей системы."
+"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:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
-msgstr "После выполнения операций выбора, вы увидите демонстрацию слайдов. Отключить показ слайдов можно нажатием кнопки <guilabel>Подробности</guilabel>."
+msgstr ""
+"После выполнения операций выбора, вы увидите демонстрацию слайдов. Отключить "
+"показ слайдов можно нажатием кнопки <guilabel>Подробности</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -685,119 +844,153 @@ msgid ""
 "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."
-msgstr "Выберите желаемую для вас графическую среду, <application>KDE</application> или <application>Gnome</application>. Эти среды объединяют полноценные наборы программ и инструментов. Отметьте пункт <guilabel>Дополнительно</guilabel>, если вы намерены не использовать ни одну из этих сред, намерены использовать обе или хотите выбрать какой-то особый перечень программного обеспечения для этих сред. Рабочая среда <application>LXDE</application> является менее требовательным к ресурсам, чем первые две среды, но выглядит не так ярко и по умолчанию содержит меньше полезных программ."
+msgstr ""
+"Выберите желаемую для вас графическую среду, <application>KDE</application> "
+"или <application>Gnome</application>. Эти среды объединяют полноценные "
+"наборы программ и инструментов. Отметьте пункт <guilabel>Дополнительно</"
+"guilabel>, если вы намерены не использовать ни одну из этих сред, намерены "
+"использовать обе или хотите выбрать какой-то особый перечень программного "
+"обеспечения для этих сред. Рабочая среда <application>LXDE</application> "
+"является менее требовательным к ресурсам, чем первые две среды, но выглядит "
+"не так ярко и по умолчанию содержит меньше полезных программ."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Выбор групп пакетов"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into 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."
-msgstr "Чтобы облегчить выбор нужных вам пакетов, список разделен на группы. Назначение групп можно понять из их названий, впрочем, вы можете получить подсказку относительно содержания группы в ответ на наведение указателя мыши на пункт группы в списке."
+msgstr ""
+"Чтобы облегчить выбор нужных вам пакетов, список разделен на группы. "
+"Назначение групп можно понять из их названий, впрочем, вы можете получить "
+"подсказку относительно содержания группы в ответ на наведение указателя мыши "
+"на пункт группы в списке."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Рабочая станция."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Сервер."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Графическая среда."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
-msgstr "Индивидуальный выбор пакетов: этот вариант можно использовать для добавления или удаления пакетов вручную."
+msgstr ""
+"Индивидуальный выбор пакетов: этот вариант можно использовать для добавления "
+"или удаления пакетов вручную."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do"
-" a minimal install (without or with X &amp; IceWM)."
-msgstr "Ознакомьтесь с разделом <xref linkend=\"minimal-install\"></xref>, где изложены инструкции относительно установки минимальной системы (без или с графическим сервером и IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
+msgstr ""
+"Ознакомьтесь с разделом <xref linkend=\"minimal-install\"></xref>, где "
+"изложены инструкции относительно установки минимальной системы (без или с "
+"графическим сервером и IceWM)."
 
 #. type: Content of: <section><info><title>
 #: en/choosePackagesTree.xml:4
 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
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:17
 msgid ""
-"Here you can add or remove any extra packages to customise your "
-"installation."
-msgstr "С помощью этого варианта можно выбрать дополнительные пакеты, которые дополнят установленную вами систему, или удалить пакеты, являющиеся частью типового набора."
+"Here you can add or remove any extra packages to customise your installation."
+msgstr ""
+"С помощью этого варианта можно выбрать дополнительные пакеты, которые "
+"дополнят установленную вами систему, или удалить пакеты, являющиеся частью "
+"типового набора."
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:20
 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."
-msgstr "Как только выбор будет сделан, вы сможете нажать <guibutton>значок дискеты</guibutton> в нижней части страницы, чтобы сохранить список пакетов (данные можно сохранить на флэш-носителе USB). После этого сохраненным файлом можно будет воспользоваться для установки системы на другие компьютеры: достаточно нажать эту кнопку еще раз при установке и загрузить сохраненный файл."
+"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 ""
+"Как только выбор будет сделан, вы сможете нажать <guibutton>значок дискеты</"
+"guibutton> в нижней части страницы, чтобы сохранить список пакетов (данные "
+"можно сохранить на флэш-носителе USB). После этого сохраненным файлом можно "
+"будет воспользоваться для установки системы на другие компьютеры: достаточно "
+"нажать эту кнопку еще раз при установке и загрузить сохраненный файл."
 
 #. type: Content of: <section><info><title>
 #: en/configureServices.xml:12
 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
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:27
 msgid ""
-"Here you can set which services should (not) start when you boot your "
-"system."
-msgstr "С помощью этой страницы вы можете определить, какие службы будут запускаться, а какие нет, при загрузке вашей системы."
+"Here you can set which services should (not) 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 "Предусмотрено четыре группы служб. Чтобы развернуть список каждой из групп, нажмите кнопку с изображением треугольника перед пунктом группы."
+"There are four groups, click on the triangle before a group to expand it and "
+"see all services in it."
+msgstr ""
+"Предусмотрено четыре группы служб. Чтобы развернуть список каждой из групп, "
+"нажмите кнопку с изображением треугольника перед пунктом группы."
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:34
@@ -809,50 +1002,67 @@ msgstr "Обычно необходимости в изменении настр
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
-msgstr "После обозначения пункта службы, программа покажет дополнительные данные о службе на панели под списком."
+msgstr ""
+"После обозначения пункта службы, программа покажет дополнительные данные о "
+"службе на панели под списком."
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:41
 msgid "Only change things when you know very well what you are doing."
-msgstr "Вносите изменения только если вам хорошо известны последствия ваших действий."
+msgstr ""
+"Вносите изменения только если вам хорошо известны последствия ваших действий."
 
 #. type: Content of: <section><info><title>
 #: en/configureTimezoneUTC.xml:3
 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>"
-msgstr "<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 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>"
+msgstr ""
+"<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>"
 
 #. 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."
-msgstr "Выберите ваш часовой пояс. Для этого достаточно выбрать вашу страну или какой-то город рядом с вашим местом пребывания так, чтобы этот город был расположен в том же часовом поясе."
+"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."
-msgstr "С помощью следующего раздела вы можете указать режим работы системных часов компьютера: использование местного времени или времени по Гринвичу (GMT), также известного как Всемирное время (UTC)."
+"In 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>
 #: en/configureTimezoneUTC.xml:29
 msgid ""
 "If you have more than one operating system on your computer, make sure they "
 "are all set to local time, or all to UTC/GMT."
-msgstr "Если на компьютере установлено несколько операционных систем, убедитесь, что во всех этих системах используется местное время или Всемирное время (UTC/GMT)."
+msgstr ""
+"Если на компьютере установлено несколько операционных систем, убедитесь, что "
+"во всех этих системах используется местное время или Всемирное время (UTC/"
+"GMT)."
 
 #. type: Content of: <section><info><title>
 #: en/configureX_card_list.xml:11
@@ -862,24 +1072,32 @@ msgstr "Выбор графического сервера (настройки �
 #. type: Content of: <section><mediaobject>
 #: en/configureX_card_list.xml:16
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:21
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
-msgstr "В DrakX предусмотрена очень полная база данных графических карт. Обычно, программа может правильно определить ваш видеоадаптер."
+msgstr ""
+"В DrakX предусмотрена очень полная база данных графических карт. Обычно, "
+"программа может правильно определить ваш видеоадаптер."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:24
 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 "Если установщику не удалось должным образом определить вашу графическую карту, и вам известно название этой карты, вы можете выбрать ее из иерархического списка по следующим критериям:"
+msgstr ""
+"Если установщику не удалось должным образом определить вашу графическую "
+"карту, и вам известно название этой карты, вы можете выбрать ее из "
+"иерархического списка по следующим критериям:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
@@ -902,7 +1120,10 @@ 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»."
+msgstr ""
+"Если вашей карты нет в списке карт по производителям (поскольку она еще не "
+"успела попасть в базы данных или слишком старая), вы можете найти "
+"соответствующий драйвер в категории «Xorg»."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:43
@@ -910,14 +1131,20 @@ 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 "В категории «Xorg» вы можете воспользоваться одним из более 40 типовых драйверов с открытым кодом для видеокарт. Если вам все же не удастся найти драйвер по названию, вы можете воспользоваться драйвером \"vesa\". Этот драйвер обеспечивает базовые возможности видео."
+msgstr ""
+"В категории «Xorg» вы можете воспользоваться одним из более 40 типовых "
+"драйверов с открытым кодом для видеокарт. Если вам все же не удастся найти "
+"драйвер по названию, вы можете воспользоваться драйвером \"vesa\". Этот "
+"драйвер обеспечивает базовые возможности видео."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:48
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the Commandline Interface."
-msgstr "Будьте внимательны: если драйвер будет выбран ошибочно, вы сможете получить доступ только к интерфейсу командной строки."
+msgstr ""
+"Будьте внимательны: если драйвер будет выбран ошибочно, вы сможете получить "
+"доступ только к интерфейсу командной строки."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
@@ -925,30 +1152,36 @@ 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."
-msgstr "Некоторые производители видеокарт сами создают проприетарные (закрытые) драйверы для Linux. Доступ к таким драйверов можно получить только с помощью репозиториев пакетов «Nonfree» или на сайтах производителей карт."
+msgstr ""
+"Некоторые производители видеокарт сами создают проприетарные (закрытые) "
+"драйверы для Linux. Доступ к таким драйверов можно получить только с помощью "
+"репозиториев пакетов «Nonfree» или на сайтах производителей карт."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:55
 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."
-msgstr "Вам следует явным образом включить репозитории «Nonfree», чтобы иметь к ним доступ. Сделать это можно и позднее - после первой перезагрузки системы."
+msgstr ""
+"Вам следует явным образом включить репозитории «Nonfree», чтобы иметь к ним "
+"доступ. Сделать это можно и позднее - после первой перезагрузки системы."
 
 #. type: Content of: <section><info><title>
 #: en/configureX_chooser.xml:4
 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
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/configureX_chooser.xml:18
@@ -957,19 +1190,31 @@ msgid ""
 "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."
-msgstr "Безразлично, какая графическая среда (или рабочая среда) была выбрана во время установки <application>Mageia</application>, все эти среды основаны на графическом интерфейсе, который называется <acronym>X Window System</acronym> или просто <acronym>X</acronym>. Следовательно, чтобы <acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> или любая другая графическая среда работала должным образом, указанные ниже параметры работы сервера <acronym>X</acronym> должны быть определены правильно. Изменять значения параметров следует, если заметно, что <application>DrakX</application> сделал ошибочный выбор, или если вам кажется, что этот выбор является ошибочным."
+"<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."
+msgstr ""
+"Безразлично, какая графическая среда (или рабочая среда) была выбрана во "
+"время установки <application>Mageia</application>, все эти среды основаны на "
+"графическом интерфейсе, который называется <acronym>X Window System</"
+"acronym> или просто <acronym>X</acronym>. Следовательно, чтобы <acronym>KDE</"
+"acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> или любая другая "
+"графическая среда работала должным образом, указанные ниже параметры работы "
+"сервера <acronym>X</acronym> должны быть определены правильно. Изменять "
+"значения параметров следует, если заметно, что <application>DrakX</"
+"application> сделал ошибочный выбор, или если вам кажется, что этот выбор "
+"является ошибочным."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:31
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
-msgstr "<emphasis><guibutton>Графическая карта</guibutton></emphasis>: если нужно, выберите установленную на компьютере графическую карту из списка."
+msgstr ""
+"<emphasis><guibutton>Графическая карта</guibutton></emphasis>: если нужно, "
+"выберите установленную на компьютере графическую карту из списка."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:37
@@ -979,19 +1224,29 @@ msgid ""
 "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> если считаете, что это правильно, или выбрать пункт вашего монитора из списка <guilabel>Производитель</guilabel> или <guilabel>Общий</guilabel>. Выберете пункт <guilabel>Дополнительно</guilabel>, если хотите вручную указать частоту обновления изображения по вертикали и горизонтали для вашего монитора."
+msgstr ""
+"<emphasis><guibutton>Монитор</guibutton></emphasis>: вы можете выбрать "
+"<guilabel>Plug'n Play</guilabel> если считаете, что это правильно, или "
+"выбрать пункт вашего монитора из списка <guilabel>Производитель</guilabel> "
+"или <guilabel>Общий</guilabel>. Выберете пункт <guilabel>Дополнительно</"
+"guilabel>, если хотите вручную указать частоту обновления изображения по "
+"вертикали и горизонтали для вашего монитора."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
 #: en/configureX_chooser.xml:45
 msgid "Incorrect refresh rates may damage your monitor"
-msgstr "Ошибочно указанные частоты обновления изображения могут привести к повреждению монитора."
+msgstr ""
+"Ошибочно указанные частоты обновления изображения могут привести к "
+"повреждению монитора."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:51
 msgid ""
 "<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
 "resolution and color depth of your monitor here."
-msgstr "<emphasis><guibutton>Разрешение</guibutton></emphasis>: с помощью этого пункта можно выбрать желаемое разрешение и глубину цвета на вашем мониторе."
+msgstr ""
+"<emphasis><guibutton>Разрешение</guibutton></emphasis>: с помощью этого "
+"пункта можно выбрать желаемое разрешение и глубину цвета на вашем мониторе."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:56
@@ -999,19 +1254,30 @@ 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>"
-msgstr "<emphasis><guibutton>Проверить</guibutton></emphasis>: кнопка проверки при установке недоступна. Если кнопка доступна, посредством ее нажатия вы можете проверить, правильно ли указаны параметры. В ответ на вопрос о правильности параметров вы можете ответить «да», чтобы сохранить указанные параметры. Если же изображения на мониторе нет, то система через некоторое время вернет вас к окну настройки, с помощью которого вы сможете исправить настройки, пока не будет достигнут желаемый результат. <emphasis>Если кнопка проверки недоступна, вам следует самостоятельно позаботиться о том, чтобы указанные параметры были безопасными.</emphasis>"
+"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>"
+msgstr ""
+"<emphasis><guibutton>Проверить</guibutton></emphasis>: кнопка проверки при "
+"установке недоступна. Если кнопка доступна, посредством ее нажатия вы можете "
+"проверить, правильно ли указаны параметры. В ответ на вопрос о правильности "
+"параметров вы можете ответить «да», чтобы сохранить указанные параметры. "
+"Если же изображения на мониторе нет, то система через некоторое время вернет "
+"вас к окну настройки, с помощью которого вы сможете исправить настройки, "
+"пока не будет достигнут желаемый результат. <emphasis>Если кнопка проверки "
+"недоступна, вам следует самостоятельно позаботиться о том, чтобы указанные "
+"параметры были безопасными.</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:67
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
-msgstr "<emphasis><guibutton>Параметры</guibutton></emphasis>: с помощью этого пункта вы можете включить или отключить различные параметры."
+msgstr ""
+"<emphasis><guibutton>Параметры</guibutton></emphasis>: с помощью этого "
+"пункта вы можете включить или отключить различные параметры."
 
 #. type: Content of: <section><info><title>
 #: en/configureX_monitor.xml:18
@@ -1023,7 +1289,9 @@ msgstr "Выбор монитора"
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
-msgstr "В DrakX предусмотрена очень полная база данных мониторов. Обычно, программа может правильно определить ваш монитор."
+msgstr ""
+"В DrakX предусмотрена очень полная база данных мониторов. Обычно, программа "
+"может правильно определить ваш монитор."
 
 #. type: Content of: <section><warning><para>
 #: en/configureX_monitor.xml:26
@@ -1032,15 +1300,22 @@ msgid ""
 "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> Если есть определенные сомнения, обратитесь к документации вашего монитора."
+msgstr ""
+"<emphasis>Выбор пункта монитора с другими аппаратными характеристиками может "
+"привести к повреждению монитора или видеоаппаратуры. Пожалуйста, подумайте "
+"над вашим выбором.</emphasis> Если есть определенные сомнения, обратитесь к "
+"документации вашего монитора."
 
 #. type: Content of: <section><mediaobject>
 #: en/configureX_monitor.xml:34
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:42
@@ -1051,10 +1326,15 @@ msgstr "<emphasis>Дополнительно</emphasis>"
 #: en/configureX_monitor.xml:44
 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."
-msgstr "С помощью этого пункта вы можете установить значение двух критических параметров: вертикальной частоты обновления и горизонтальной частоты синхронизации. Частота обновления определяет частоту, с которой обновляется изображение на экране, а частота синхронизации является частотой, с которой будут показаны линии изображения."
+"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
@@ -1063,7 +1343,11 @@ msgid ""
 "type with a sync range that is beyond the capabilities of your monitor: you "
 "may damage your monitor. If in doubt, choose a conservative setting and "
 "consult your monitor documentation."
-msgstr "<emphasis>ОЧЕНЬ ВАЖНО</emphasis> не указать тип монитора, возможности которого превышают возможности вашего, иначе вы можете повредите монитор. Если сомневаетесь, выберите минимальные параметры и внимательно ознакомьтесь с документацией к вашему монитору."
+msgstr ""
+"<emphasis>ОЧЕНЬ ВАЖНО</emphasis> не указать тип монитора, возможности "
+"которого превышают возможности вашего, иначе вы можете повредите монитор. "
+"Если сомневаетесь, выберите минимальные параметры и внимательно ознакомьтесь "
+"с документацией к вашему монитору."
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:55
@@ -1075,7 +1359,9 @@ msgstr "<emphasis>Plug 'n Play</emphasis>"
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
-msgstr "Это дефолтный вариант: программа пытается определить тип вашего монитора по базе данных мониторов."
+msgstr ""
+"Это дефолтный вариант: программа пытается определить тип вашего монитора по "
+"базе данных мониторов."
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:63
@@ -1087,7 +1373,10 @@ msgstr "<emphasis>Производитель</emphasis>"
 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 "Если установщику не удалось должным образом определить ваш монитор, и вам известно название этого монитора, вы можете выбрать его из иерархического списка по следующим критериям:"
+msgstr ""
+"Если установщику не удалось должным образом определить ваш монитор, и вам "
+"известно название этого монитора, вы можете выбрать его из иерархического "
+"списка по следующим критериям:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/configureX_monitor.xml:73
@@ -1108,163 +1397,260 @@ msgstr "<emphasis>Общий</emphasis>"
 #: en/configureX_monitor.xml:84
 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."
-msgstr "Если вы выберете эту группу, будет открыт список из около 30 типовых настроек дисплеев, подобных 1024x768@60 Гц, в который включены параметры плоских панелей дисплеев для ноутбуков. Обычно, этой группой стоит пользоваться, если у вас возникла необходимость использовать драйвер «Vesa» для вашей карты, то есть вашу видеокарту не удалось определить автоматически. Опять же, стоит параметры выбирать очень осторожно."
+"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the Vesa card driver "
+"when your video hardware cannot be determined automatically. Once again it "
+"may be wise to be conservative in your selections."
+msgstr ""
+"Если вы выберете эту группу, будет открыт список из около 30 типовых "
+"настроек дисплеев, подобных 1024x768@60 Гц, в который включены параметры "
+"плоских панелей дисплеев для ноутбуков. Обычно, этой группой стоит "
+"пользоваться, если у вас возникла необходимость использовать драйвер «Vesa» "
+"для вашей карты, то есть вашу видеокарту не удалось определить "
+"автоматически. Опять же, стоит параметры выбирать очень осторожно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ручное разделение диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\""
-" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
-msgstr "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
+"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."
-msgstr "Если на вашем разделе <literal>/</literal> вы хотите воспользоваться шифрованием, то каталог <literal>/boot</literal> следует хранить на отдельном разделе. Не следует шифровать каталог <literal>/boot</literal>, иначе загрузка системы станет невозможной."
+msgstr ""
+"Если на вашем разделе <literal>/</literal> вы хотите воспользоваться "
+"шифрованием, то каталог <literal>/boot</literal> следует хранить на "
+"отдельном разделе. Не следует шифровать каталог <literal>/boot</literal>, "
+"иначе загрузка системы станет невозможной."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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."
-msgstr "С помощью этой страницы можно определить компоновку разделов(ла) в вашей системе. С ее помощью можно извлекать и создавать разделы, менять файловые системы на разделах или размеры разделов и даже просматривать содержимое разделов до внесения изменений."
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
+msgstr ""
+"С помощью этой страницы можно определить компоновку разделов(ла) в вашей "
+"системе. С ее помощью можно извлекать и создавать разделы, менять файловые "
+"системы на разделах или размеры разделов и даже просматривать содержимое "
+"разделов до внесения изменений."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
-msgstr "Для каждого обнаруженного жесткого диска или другого носителя данных (в частности флэш USB) будет отведена своя вкладка. Пример: sda, sdb и sdc, если будет обнаружено три диска."
+"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, "
+"если будет обнаружено три диска."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected"
-" storage device"
-msgstr "Нажмите кнопку <guibutton>Очистить все</guibutton>, чтобы все разделы на выбранном носителе данных были очищены."
+"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
+"storage device"
+msgstr ""
+"Нажмите кнопку <guibutton>Очистить все</guibutton>, чтобы все разделы на "
+"выбранном носителе данных были очищены."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
-msgstr "Чтобы выполнить любое другое действие, сначала отметьте область соответствующего раздела. Затем просмотрите данные по разделу, измените его файловую систему и точку монтирования, размеры или просто удалите все разделы."
+msgstr ""
+"Чтобы выполнить любое другое действие, сначала отметьте область "
+"соответствующего раздела. Затем просмотрите данные по разделу, измените его "
+"файловую систему и точку монтирования, размеры или просто удалите все "
+"разделы."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
-msgstr "Повторяйте эти действия для всех соответствующих разделов, пока все не станет так, как вы хотите."
+msgstr ""
+"Повторяйте эти действия для всех соответствующих разделов, пока все не "
+"станет так, как вы хотите."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
-msgstr "Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут завершены."
+msgstr ""
+"Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут "
+"завершены."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
+#, 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 above)"
-msgstr "Если вы устанавливаете Mageia в систему с UEFI, убедитесь, что существует ESP (EFI System Partition) и она смонтирована в  /boot/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:69
-msgid "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+#: en/diskdrake.xml:57
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Если вы устанавливаете Mageia в систему с UEFI, убедитесь, что существует "
+"ESP (EFI System Partition) и она смонтирована в  /boot/EFI (см. Выше)."
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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>."
-msgstr "С помощью этой страницы вы можете просмотреть содержимое всех дисков компьютера и ознакомиться с предложениями мастера разбиения на разделы DrakX о месте установки <application>Mageia</application>."
+msgstr ""
+"С помощью этой страницы вы можете просмотреть содержимое всех дисков "
+"компьютера и ознакомиться с предложениями мастера разбиения на разделы DrakX "
+"о месте установки <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
-msgstr "Перечень пунктов в приведённом ниже списке зависит от комплектации компьютера и содержимого дисков."
+msgstr ""
+"Перечень пунктов в приведённом ниже списке зависит от комплектации "
+"компьютера и содержимого дисков."
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:22
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:28
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Использовать существующие разделы"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
-msgstr "Этим вариантом можно будет воспользоваться, если на диске будут обнаружены совместимые с Linux разделы, которыми можно воспользоваться для установки системы."
+msgstr ""
+"Этим вариантом можно будет воспользоваться, если на диске будут обнаружены "
+"совместимые с Linux разделы, которыми можно воспользоваться для установки "
+"системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Использовать свободное место"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
-"If you have unused space on your hard drive then this option will use it for"
-" your new Mageia installation."
-msgstr "Этим вариантом можно будет воспользоваться, если на вашем диске есть свободное место, достаточное для установки новой системы Mageia."
+"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:44
+#: en/doPartitionDisks.xml:52
 msgid "Use Free Space on a Windows Partition"
 msgstr "Использовать свободное место на разделе Microsoft Windows®"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may"
-" offer to use it."
-msgstr "Этим вариантом можно будет воспользоваться, если на уже созданных разделах Windows достаточно свободного места для установки новой операционной системы."
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it."
+msgstr ""
+"Этим вариантом можно будет воспользоваться, если на уже созданных разделах "
+"Windows достаточно свободного места для установки новой операционной системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
 "important files!"
-msgstr "Этот вариант получения места для установки Mageia может быть полезным, но в случае его использования вы рискуете потерей данных, поэтому вам следует предварительно создать резервные копии важных для вас файлов!"
+msgstr ""
+"Этот вариант получения места для установки Mageia может быть полезным, но в "
+"случае его использования вы рискуете потерей данных, поэтому вам следует "
+"предварительно создать резервные копии важных для вас файлов!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1272,144 +1658,231 @@ msgid ""
 "although this is not a guarantee that all files in the partition have been "
 "moved out of the area that is about to be used. It is highly recommended to "
 "back up your personal files."
-msgstr "Заметьте, что размер раздела Windows будет уменьшен. Раздел должен быть «очищен», то есть работа Windows должна быть завершена в штатном режиме во время последнего сеанса, когда вы пользовались этой операционной системой. Кроме того, раздел должен быть дефрагментирован, хотя дефрагментация и не гарантирует полного передвижения файлов с одного места на другое на диске, который будет использован для Mageia. Мы настоятельно рекомендуем вам создать резервные копии важных для вас файлов."
+msgstr ""
+"Заметьте, что размер раздела Windows будет уменьшен. Раздел должен быть "
+"«очищен», то есть работа Windows должна быть завершена в штатном режиме во "
+"время последнего сеанса, когда вы пользовались этой операционной системой. "
+"Кроме того, раздел должен быть дефрагментирован, хотя дефрагментация и не "
+"гарантирует полного передвижения файлов с одного места на другое на диске, "
+"который будет использован для Mageia. Мы настоятельно рекомендуем вам "
+"создать резервные копии важных для вас файлов."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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."
-msgstr "Если будет выбран этот вариант, средство установки покажет остальные раздела Windows голубым цветом, а будущий раздел с Mageia - темно-синим. Размеры разделов будут указаны под ними. Вы можете изменить эти разделы перетаскиванием риски между ними с помощью указателя мыши. См. приведенный ниже снимок экрана."
+msgstr ""
+"Если будет выбран этот вариант, средство установки покажет остальные раздела "
+"Windows голубым цветом, а будущий раздел с Mageia - темно-синим. Размеры "
+"разделов будут указаны под ними. Вы можете изменить эти разделы "
+"перетаскиванием риски между ними с помощью указателя мыши. См. приведенный "
+"ниже снимок экрана."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Стереть и использовать весь диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
-msgstr "При использовании этого варианта для установки Mageia будет использован весь диск."
+msgstr ""
+"При использовании этого варианта для установки Mageia будет использован весь "
+"диск."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
-msgstr "Замечание: все данные на диске будут в таком случае уничтожены. Будьте осторожны!"
+msgstr ""
+"Замечание: все данные на диске будут в таком случае уничтожены. Будьте "
+"осторожны!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:87
+#: en/doPartitionDisks.xml:101
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
 "this option."
-msgstr "Если часть диска будет впоследствии использована для хранения каких-то данных или на диске уже хранятся какие-то важные данные, не пользуйтесь этим вариантом."
+msgstr ""
+"Если часть диска будет впоследствии использована для хранения каких-то "
+"данных или на диске уже хранятся какие-то важные данные, не пользуйтесь этим "
+"вариантом."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Вручную"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
-"This gives you complete control over the placing of the installation on your"
-" hard drive(s)."
-msgstr "С помощью этого варианта вы можете получить полный доступ к расположению разделов на вашем диске в соответствии с вашими предпочтениями."
+"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:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Размер разделов:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
-msgstr "Программа установки разделит свободное место в соответствии со следующими правилами:"
+msgstr ""
+"Программа установки разделит свободное место в соответствии со следующими "
+"правилами:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
-msgstr "Если общее доступное место меньше, чем 50 Гб, то будет создан только один раздел для / без отдельного раздела для /home."
+msgstr ""
+"Если общее доступное место меньше, чем 50 Гб, то будет создан только один "
+"раздел для / без отдельного раздела для /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
-"If the total available place is over 50 GB, then three partitions are "
-"created"
+"If the total available place is over 50 GB, then three partitions are created"
 msgstr "Если общее доступное место более, чем 50 Гб, то создаются три раздела"
 
-#. type: Content of:
-#. <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
-msgstr "6/19 от общего доступного пространства выделяется под / с максимумом 50 Гб"
+msgstr ""
+"6/19 от общего доступного пространства выделяется под / с максимумом 50 Гб"
 
-#. type: Content of:
-#. <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:139
 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:129
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "остальное (по крайней мере 12/19) выделяется под /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
-msgstr "Это означает, что из 160 Гб и более свободного места программа установки создаст три раздела: 50 Гб для /, 4 ГБ для свопа, а остальное для /home."
+msgstr ""
+"Это означает, что из 160 Гб и более свободного места программа установки "
+"создаст три раздела: 50 Гб для /, 4 ГБ для свопа, а остальное для /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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\" option is the only one that allows to check it has"
-" been correctly done"
-msgstr "Если вы используете систему UEFI, то ESP (Системный раздел EFI) будет автоматически обнаружен или создан, если он ещё не существует, и смонтирован в /boot/EFI. Опция \"Пользовательский\" является единственной, что позволяет проверить, что это было сделано правильно"
+"automatically detected, or created if it does not exist yet, and mounted on /"
+"boot/EFI. The \"Custom\" 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:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
+"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:"
-msgstr "В некоторых новых дисках используются логические сектора в 4096 байт вместо предыдущего стандарта в 512 байт на логический сектор. Так как у разработчиков нет достаточного доступа к соответствующему оборудованию, надлежащее тестирование программы для разделения диска на разделы на таких дисках не выполнялось. Советуем вам выполнить разделение такого диска на разделы с помощью альтернативной специализированной программы, например gparted с такими параметрами:"
+msgstr ""
+"В некоторых новых дисках используются логические сектора в 4096 байт вместо "
+"предыдущего стандарта в 512 байт на логический сектор. Так как у "
+"разработчиков нет достаточного доступа к соответствующему оборудованию, "
+"надлежащее тестирование программы для разделения диска на разделы на таких "
+"дисках не выполнялось. Советуем вам выполнить разделение такого диска на "
+"разделы с помощью альтернативной специализированной программы, например "
+"gparted с такими параметрами:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "«Выровнять по» «МиБ»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "«Свободное место до (МиБ)» «2»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "Также следует создавать разделы только с чётным размером в мегабайтах."
@@ -1449,27 +1922,38 @@ msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 #: 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>."
-msgstr "Текст и фотографии окон в этом учебнике предоставляются вам в соответствии с условиями лицензирования CC BY-SA 3.0 <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 ""
+"Текст и фотографии окон в этом учебнике предоставляются вам в соответствии с "
+"условиями лицензирования CC BY-SA 3.0 <link ns6:href=\"http://"
+"creativecommons.org/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/DrakX.xml:16
 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>."
-msgstr "Этот учебник был создан с помощью <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link>, разработанной компанией <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 ""
+"Этот учебник был создан с помощью <link ns6:href=\"http://www.calenco.com"
+"\">Calenco CMS</link>, разработанной компанией <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/DrakX.xml:18
 msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
-msgstr "Учебник был написан доброжелателями в свободное от основной работы время. Пожалуйста, обратитесь к <link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">команды документирования</link>, Если вы хотите, помочь улучшить данное руководство."
+"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 ""
+"Учебник был написан доброжелателями в свободное от основной работы время. "
+"Пожалуйста, обратитесь к <link ns6:href=\"https://wiki.mageia.org/en/"
+"Documentation_team\">команды документирования</link>, Если вы хотите, помочь "
+"улучшить данное руководство."
 
 #. type: Content of: <article><info><cover><para><note>
 #: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
@@ -1481,10 +1965,13 @@ msgstr "<note>"
 #: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
 #: 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 "Все страницы, описанные в этом учебнике увидеть сразу невозможно. Набор страниц, которые вы увидите, зависит от набора оборудования в системе и выбранного вами варианта установки."
+msgstr ""
+"Все страницы, описанные в этом учебнике увидеть сразу невозможно. Набор "
+"страниц, которые вы увидите, зависит от набора оборудования в системе и "
+"выбранного вами варианта установки."
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
@@ -1508,94 +1995,116 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Поздравляем"
 
-#.  Started by marja on 2012 03 29
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#.  marja - 2012-04-24 added screenshot and text
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
+msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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."
-msgstr "Теперь <application>Mageia</application> установлена и настроена, можно извлекать носитель для установки системы и перезагружать компьютер."
+"You have finished installing and configuring <application>Mageia</"
+"application> and it is now safe to remove the installation medium and reboot "
+"your computer."
+msgstr ""
+"Теперь <application>Mageia</application> установлена и настроена, можно "
+"извлекать носитель для установки системы и перезагружать компьютер."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
-msgstr "После перезагрузки с помощью экрана загрузки вы сможете выбрать одну из операционных систем, установленных на вашем компьютере (если установлено несколько систем)."
+"After reboot, in the bootloader screen, you can choose between the operating "
+"systems on your computer (if you have more than one)."
+msgstr ""
+"После перезагрузки с помощью экрана загрузки вы сможете выбрать одну из "
+"операционных систем, установленных на вашем компьютере (если установлено "
+"несколько систем)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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."
+msgstr ""
+"Если вы не скорректируете параметры загрузчика, тогда автоматически "
+"запустится установленная вами операционная система Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Приятной работы!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
-msgstr "Посетите www.mageia.org, если хотите узнать больше об участии в сообществе Mageia"
+msgstr ""
+"Посетите www.mageia.org, если хотите узнать больше об участии в сообществе "
+"Mageia"
 
 #. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 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
 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 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>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
 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."
-msgstr "С помощью этой страницы вы можете определиться с тем, какие разделы следует форматировать. Все данные на разделах, которые <emphasis>не</emphasis> отмечены для форматирования, будут сохранены."
+msgstr ""
+"С помощью этой страницы вы можете определиться с тем, какие разделы следует "
+"форматировать. Все данные на разделах, которые <emphasis>не</emphasis> "
+"отмечены для форматирования, будут сохранены."
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:34
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
-msgstr "Обычно форматирование нужно по крайней мере для разделов, выбранных DrakX."
+msgstr ""
+"Обычно форматирование нужно по крайней мере для разделов, выбранных DrakX."
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:37
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
-msgstr "Нажмите кнопку <guibutton>Дополнительно</guibutton>, чтобы выбрать разделы, которые следует проверить на так называемые <emphasis>поврежденные блоки</emphasis>."
+msgstr ""
+"Нажмите кнопку <guibutton>Дополнительно</guibutton>, чтобы выбрать разделы, "
+"которые следует проверить на так называемые <emphasis>поврежденные блоки</"
+"emphasis>."
 
 #. type: Content of: <section><tip><para>
 #: en/formatPartitions.xml:42
@@ -1604,14 +2113,20 @@ msgid ""
 "<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."
-msgstr "Если вы не уверены в правильности своего выбора, вы можете нажать кнопку <guibutton>Назад</guibutton>, еще раз <guibutton>Назад</guibutton>, а потом кнопку <guibutton>Вручную</guibutton>, чтобы вернуться к основной странице. С помощью основной страницы можно просмотреть текущие параметры разделов."
+msgstr ""
+"Если вы не уверены в правильности своего выбора, вы можете нажать кнопку "
+"<guibutton>Назад</guibutton>, еще раз <guibutton>Назад</guibutton>, а потом "
+"кнопку <guibutton>Вручную</guibutton>, чтобы вернуться к основной странице. "
+"С помощью основной страницы можно просмотреть текущие параметры разделов."
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:49
 msgid ""
-"When you are confident about the selection, click on "
-"<guibutton>Next</guibutton> to continue."
-msgstr "Если вы уверены в своем выборе, нажмите кнопку <guibutton>Далее</guibutton>, чтобы продолжить работу с программой."
+"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:17
@@ -1624,14 +2139,20 @@ msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
 "possible."
-msgstr "Неважно, есть у вас опыт использования GNU-Linux или нет, программа для установки Mageia разработана таким образом, чтобы  установка или обновление системы прошло как можно проще для вас."
+msgstr ""
+"Неважно, есть у вас опыт использования GNU-Linux или нет, программа для "
+"установки Mageia разработана таким образом, чтобы  установка или обновление "
+"системы прошло как можно проще для вас."
 
 #. type: Content of: <section><para>
 #: en/installer.xml:28
 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 "На начальном окне меню установки вы увидите пункты вариантов действий. Типичным будет пункт запуска программы для установки системы. Обычно, это именно тот пункт, который вам нужен."
+msgstr ""
+"На начальном окне меню установки вы увидите пункты вариантов действий. "
+"Типичным будет пункт запуска программы для установки системы. Обычно, это "
+"именно тот пункт, который вам нужен."
 
 #. type: Content of: <section><figure><info><title>
 #: en/installer.xml:34
@@ -1648,22 +2169,32 @@ msgstr "<placeholder type=\"info\" id=\"0\"/>"
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
 "with a legacy system and the second one with an UEFI system:"
-msgstr "Ниже приведены стандартные окна приветствия DVD Mageia. Первое из них соответствует устаревшей версии системы, второе - системе с UEFI:"
+msgstr ""
+"Ниже приведены стандартные окна приветствия DVD Mageia. Первое из них "
+"соответствует устаревшей версии системы, второе - системе с UEFI:"
 
 #. type: Content of: <section><figure><mediaobject>
 #: en/installer.xml:42
 msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:54
@@ -1676,56 +2207,74 @@ 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 (только в устаревшем режиме)."
+msgstr ""
+"Язык (на время установки, в системе может быть выбран совсем другой язык) "
+"можно выбрать после нажатия клавиши F2 (только в устаревшем режиме)."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:66
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:71
 msgid "Use the arrow keys to select the language and press the key Enter."
-msgstr "Используйте клавиши со стрелками, чтобы выбрать нужный вам пункт в списке, и нажмите клавишу Enter."
+msgstr ""
+"Используйте клавиши со стрелками, чтобы выбрать нужный вам пункт в списке, и "
+"нажмите клавишу Enter."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:74
 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>."
+"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><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:82
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:91
-msgid ""
-"Change the screen resolution by pressing the F3 key (Legacy mode only)."
-msgstr "Изменить разрешение экрана можно с помощью нажатия клавиши F3 (только в устаревшем режиме)."
+msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
+msgstr ""
+"Изменить разрешение экрана можно с помощью нажатия клавиши F3 (только в "
+"устаревшем режиме)."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:95
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:102
 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."
+"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><itemizedlist><listitem><para>
 #: en/installer.xml:104
@@ -1733,7 +2282,12 @@ 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>) с такими четырьмя подпунктами:"
+msgstr ""
+"Если программе установки не удаётся выполнить свое назначение должным "
+"образом, вы можете повторить попытку, воспользовавшись дополнительными "
+"возможностями. В меню, которое можно вызвать нажатием клавиши F6, будет "
+"показан новый пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметры "
+"загрузки</guilabel>) с такими четырьмя подпунктами:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:109
@@ -1745,28 +2299,37 @@ msgstr "- Default (по умолчанию), не менять ничего в �
 msgid ""
 "- Safe Settings, priority is given to the safer options to the detriment of "
 "performances."
-msgstr "- Safe Settings (безопасные параметры), преимущество параметров безопасности над быстродействием."
+msgstr ""
+"- Safe Settings (безопасные параметры), преимущество параметров безопасности "
+"над быстродействием."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:115
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
-msgstr "- No ACPI (без расширенного интерфейса настройки и управления питанием), не принимать во внимание параметры управления питанием."
+msgstr ""
+"- No ACPI (без расширенного интерфейса настройки и управления питанием), не "
+"принимать во внимание параметры управления питанием."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:118
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
-msgstr "- No Local APIC (без локального расширенного контроллера прерываний с возможностью программирования), этот вариант связан с прерываниями работы центрального процессора, выберите его, если есть соответствующие установки."
+msgstr ""
+"- No Local APIC (без локального расширенного контроллера прерываний с "
+"возможностью программирования), этот вариант связан с прерываниями работы "
+"центрального процессора, выберите его, если есть соответствующие установки."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:122
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr "Выбор одного из пунктов приводит к внесению изменений в параметры по умолчанию, показанные в строке <guilabel>Параметры загрузки</guilabel>."
+msgstr ""
+"Выбор одного из пунктов приводит к внесению изменений в параметры по "
+"умолчанию, показанные в строке <guilabel>Параметры загрузки</guilabel>."
 
 #. type: Content of: <section><itemizedlist><listitem><note><para>
 #: en/installer.xml:126
@@ -1774,19 +2337,26 @@ 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 "В некоторых релизах Mageia параметры, выбранные с помощью F6, не появляются в строке <guilabel>Параметры загрузки</guilabel>. Однако, эти параметры будут учтены при загрузке."
+msgstr ""
+"В некоторых релизах Mageia параметры, выбранные с помощью F6, не появляются "
+"в строке <guilabel>Параметры загрузки</guilabel>. Однако, эти параметры "
+"будут учтены при загрузке."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:133
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:140
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
-msgstr "Дополнительные параметры работы ядра можно указать после нажатия клавиши F1 (только в устаревшем режиме)."
+msgstr ""
+"Дополнительные параметры работы ядра можно указать после нажатия клавиши F1 "
+"(только в устаревшем режиме)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:143
@@ -1794,14 +2364,20 @@ 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."
-msgstr "Нажатие клавиши F1 открывает новое окно со списком пунктов. Выберите один из пунктов с помощью клавиш со стрелками и нажмите клавишу Enter, чтобы получить подробную справку, или нажмите клавишу Esc, чтобы вернуться к окну приветствия."
+msgstr ""
+"Нажатие клавиши F1 открывает новое окно со списком пунктов. Выберите один из "
+"пунктов с помощью клавиш со стрелками и нажмите клавишу Enter, чтобы "
+"получить подробную справку, или нажмите клавишу Esc, чтобы вернуться к окну "
+"приветствия."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:150
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:157
@@ -1810,44 +2386,61 @@ msgid ""
 "<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 "Ниже приведён снимок окна с подробным описанием параметров окна приветствия системы. Нажмите клавишу Esc или выберите <guilabel>Return to Boot Options</guilabel> (Вернуться к Параметрам загрузки), чтобы вернуться к списку параметров. Описанные в окне параметры можно добавить вручную в строку <guilabel>Параметры загрузки</guilabel>."
+msgstr ""
+"Ниже приведён снимок окна с подробным описанием параметров окна приветствия "
+"системы. Нажмите клавишу Esc или выберите <guilabel>Return to Boot Options</"
+"guilabel> (Вернуться к Параметрам загрузки), чтобы вернуться к списку "
+"параметров. Описанные в окне параметры можно добавить вручную в строку "
+"<guilabel>Параметры загрузки</guilabel>."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:163
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><note><para>
 #: en/installer.xml:171
 msgid "The help is translated in the chosen language with the F2 key."
-msgstr "Посмотреть перевод справки на выбранном языке можно с помощью нажатия клавиши F2."
+msgstr ""
+"Посмотреть перевод справки на выбранном языке можно с помощью нажатия "
+"клавиши F2."
 
 #. type: Content of: <section><para>
 #: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
-"<link "
-"ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
-msgstr "Подробное описание параметров ядра в устаревших системах и системах с UEFI можно найти  <link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">здесь</link>."
+"<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
+"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+msgstr ""
+"Подробное описание параметров ядра в устаревших системах и системах с UEFI "
+"можно найти  <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">здесь</link>."
 
 #. type: Content of: <section><para>
 #: en/installer.xml:180
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
 "Installation CD (Boot.iso or Boot-Nonfree.iso images):"
-msgstr "Ниже приведено окно приветствия по умолчанию образа для установки по сети (названия - Boot.iso или Boot-Nonfree.iso):"
+msgstr ""
+"Ниже приведено окно приветствия по умолчанию образа для установки по сети "
+"(названия - Boot.iso или Boot-Nonfree.iso):"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:183
 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>"
+"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><warning><para>
 #: en/installer.xml:189
@@ -1857,9 +2450,11 @@ msgstr "Раскладка клавиатуры соответствует ам�
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:193
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" "
-"align=\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align=\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/installer.xml:200
@@ -1869,24 +2464,32 @@ msgstr "Шаги установки"
 #. type: Content of: <section><section><para>
 #: en/installer.xml:203
 msgid ""
-"The install process is divided into a number of steps, which can be followed"
-" on the side panel of the screen."
-msgstr "Установка разделена на последовательность шагов, перечень которых будет показан на боковой панели экрана."
+"The install process is divided into a number of steps, which can be followed "
+"on the side panel of the screen."
+msgstr ""
+"Установка разделена на последовательность шагов, перечень которых будет "
+"показан на боковой панели экрана."
 
 #. type: Content of: <section><section><para>
 #: en/installer.xml:206
 msgid ""
-"Each step has one or more screens which may also have "
-"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
-"options."
-msgstr "На каждом шаге вам будут показаны одна или несколько страниц, на которых вы можете увидеть кнопку <guibutton>Дополнительно</guibutton>. С помощью этой кнопки осуществляется доступ к дополнительным параметрам, которыми пользуются не так часто, как основными."
+"Each step has one or more screens which may also have <guibutton>Advanced</"
+"guibutton> buttons with extra, less commonly required, options."
+msgstr ""
+"На каждом шаге вам будут показаны одна или несколько страниц, на которых вы "
+"можете увидеть кнопку <guibutton>Дополнительно</guibutton>. С помощью этой "
+"кнопки осуществляется доступ к дополнительным параметрам, которыми "
+"пользуются не так часто, как основными."
 
 #. type: Content of: <section><section><para>
 #: en/installer.xml:210
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
-msgstr "На большинстве страниц вы также увидите кнопку <guibutton>Справка</guibutton>, с помощью которой можно получить дополнительные объяснения относительно текущего шага."
+msgstr ""
+"На большинстве страниц вы также увидите кнопку <guibutton>Справка</"
+"guibutton>, с помощью которой можно получить дополнительные объяснения "
+"относительно текущего шага."
 
 #. type: Content of: <section><section><note><para>
 #: en/installer.xml:214
@@ -1896,10 +2499,19 @@ msgid ""
 "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 "Если в течение процедуры установки вы решите прекратить установку, тогда вы можете перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши действия. После форматирования раздела или начала процедуры установки обновлений компьютер находиться в промежуточном состоянии. Перезагрузка может привести к невозможности пользования системой. Если, вопреки этим предупреждением, вы хотите перезагрузить систему, перейдите в текстовый терминал нажатием комбинации клавиш <guibutton>Alt Ctrl F2</guibutton> одновременно. После этого нажмите комбинацию клавиш <guibutton>Alt Ctrl Delete</guibutton> одновременно, чтобы перезагрузить компьютер."
+msgstr ""
+"Если в течение процедуры установки вы решите прекратить установку, тогда вы "
+"можете перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши "
+"действия. После форматирования раздела или начала процедуры установки "
+"обновлений компьютер находиться в промежуточном состоянии. Перезагрузка "
+"может привести к невозможности пользования системой. Если, вопреки этим "
+"предупреждением, вы хотите перезагрузить систему, перейдите в текстовый "
+"терминал нажатием комбинации клавиш <guibutton>Alt Ctrl F2</guibutton> "
+"одновременно. После этого нажмите комбинацию клавиш <guibutton>Alt Ctrl "
+"Delete</guibutton> одновременно, чтобы перезагрузить компьютер."
 
 #. type: Content of: <section><section><info><title>
 #: en/installer.xml:228
@@ -1917,7 +2529,11 @@ msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
 "resolution by typing <code>vgalo</code> at the prompt."
-msgstr "После начальной страницы не открывается страница выбора языка. Такое может случиться в системах с некоторыми графическими картами и в устаревших системах. Попробуйте воспользоваться режимом низкого разрешения. Для этого впишите <code>vgalo</code> в строку запроса."
+msgstr ""
+"После начальной страницы не открывается страница выбора языка. Такое может "
+"случиться в системах с некоторыми графическими картами и в устаревших "
+"системах. Попробуйте воспользоваться режимом низкого разрешения. Для этого "
+"впишите <code>vgalo</code> в строку запроса."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/installer.xml:246
@@ -1925,9 +2541,15 @@ 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."
-msgstr "Если компьютер является очень старым, то установка в графическом режиме может быть просто невозможна. В таком случае стоит воспользоваться текстовым режимом. Чтобы воспользоваться этим режимом, нажмите клавишу Esc, когда будет показан первый экран приветствия, и подтвердите выполнение действия нажатием клавиши Enter. Введите <code>text</code>, увидев строку \"boot:\", и нажмите клавишу Enter. Установка будет продолжена в текстовом режиме."
+"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
+"ENTER. Now continue with the installation in text mode."
+msgstr ""
+"Если компьютер является очень старым, то установка в графическом режиме "
+"может быть просто невозможна. В таком случае стоит воспользоваться текстовым "
+"режимом. Чтобы воспользоваться этим режимом, нажмите клавишу Esc, когда "
+"будет показан первый экран приветствия, и подтвердите выполнение действия "
+"нажатием клавиши Enter. Введите <code>text</code>, увидев строку \"boot:\", "
+"и нажмите клавишу Enter. Установка будет продолжена в текстовом режиме."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/installer.xml:258
@@ -1942,7 +2564,13 @@ msgid ""
 "hardware may be bypassed and dealt with later. To try this, type "
 "<code>noauto</code> at the prompt. This option may also be combined with "
 "other options as necessary."
-msgstr "Если при установке система перестает отвечать на ваши запросы, вероятно, возникла проблема с определением характеристик оборудования. В таком случае можно обойти автоматическое определение характеристик оборудования и выполнить его настройку позже. Чтобы перевести установку системы в соответствующий режим, введите в строку запроса команду <code>noauto</code>. При необходимости эту команду можно совместить с вышеуказанными командами."
+msgstr ""
+"Если при установке система перестает отвечать на ваши запросы, вероятно, "
+"возникла проблема с определением характеристик оборудования. В таком случае "
+"можно обойти автоматическое определение характеристик оборудования и "
+"выполнить его настройку позже. Чтобы перевести установку системы в "
+"соответствующий режим, введите в строку запроса команду <code>noauto</code>. "
+"При необходимости эту команду можно совместить с вышеуказанными командами."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/installer.xml:270
@@ -1954,9 +2582,15 @@ msgstr "Проблемы с RAM (оперативной памятью)"
 msgid ""
 "These 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 "Потребность в определении параметров ядра возникает не часто, но в некоторых случаях компьютер может сообщать инсталлятору ложные данные относительно объема оперативной памяти. Чтобы указать объем оперативной памяти вручную, воспользуйтесь командой <code>mem=xxxM</code>, где xxx правильное значение оперативной памяти, например <code>mem=256M</code> соответствует 256 МБ оперативной памяти."
+"<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 ""
+"Потребность в определении параметров ядра возникает не часто, но в некоторых "
+"случаях компьютер может сообщать инсталлятору ложные данные относительно "
+"объема оперативной памяти. Чтобы указать объем оперативной памяти вручную, "
+"воспользуйтесь командой <code>mem=xxxM</code>, где xxx правильное значение "
+"оперативной памяти, например <code>mem=256M</code> соответствует 256 МБ "
+"оперативной памяти."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/installer.xml:281
@@ -1969,39 +2603,43 @@ 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>."
-msgstr "Если Вы преобразовали свой диск из \"базового\" формата в \"динамический\" формат Microsoft Windows, то Вы должны знать, что невозможно установить Mageia на этот диск. Вернитесь к базовому диску, посмотрите документацию Microsoft: <link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"<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 на этот диск. Вернитесь к базовому диску, посмотрите документацию "
+"Microsoft: <link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315."
+"aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
 #: en/installUpdates.xml:3
 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
 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>"
+"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>"
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:19
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
-msgstr "Со времени выпуска этой версии <application>Mageia</application> некоторые пакеты могли быть обновлены или улучшены."
+msgstr ""
+"Со времени выпуска этой версии <application>Mageia</application> некоторые "
+"пакеты могли быть обновлены или улучшены."
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:23
@@ -2009,12 +2647,17 @@ msgid ""
 "Choose <guilabel>yes</guilabel> if you wish to download and install them, "
 "select <guilabel>no</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
-msgstr "Нажмите кнопку <guilabel>Да</guilabel>, если вы хотите получить и установить эти пакеты, или выберите <guilabel>нет</guilabel>, если вы не хотите делать этого сейчас или ваш компьютер не подключен к интернету."
+msgstr ""
+"Нажмите кнопку <guilabel>Да</guilabel>, если вы хотите получить и установить "
+"эти пакеты, или выберите <guilabel>нет</guilabel>, если вы не хотите делать "
+"этого сейчас или ваш компьютер не подключен к интернету."
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:28
 msgid "Then press <guibutton>Next</guibutton> to continue"
-msgstr "Как только выбор будет сделан, нажмите кнопку <guibutton>Далее</guibutton>, чтобы продолжить работу с программой."
+msgstr ""
+"Как только выбор будет сделан, нажмите кнопку <guibutton>Далее</guibutton>, "
+"чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
 #: en/login.xml:1
@@ -2026,7 +2669,9 @@ msgstr "Окно логина"
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
-msgstr "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-login.png\" align=\"center\" revision=\"1\"/></imageobject>"
+msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2044,70 +2689,95 @@ msgid ""
 "Enter your user name and user password, and in a few seconds you will find "
 "yourself with a loaded KDE or GNOME desktop, depending on which live medium "
 "you used. You can now start using your Mageia installation."
-msgstr "Введите имя пользователя и пароль пользователя, и через несколько секунд вы окажетесь с загруженным рабочим столом KDE или GNOME, в зависимости от того, какой live носитель вы использовали. Теперь вы можете начать использовать вашу установку Mageia."
+msgstr ""
+"Введите имя пользователя и пароль пользователя, и через несколько секунд вы "
+"окажетесь с загруженным рабочим столом KDE или GNOME, в зависимости от того, "
+"какой live носитель вы использовали. Теперь вы можете начать использовать "
+"вашу установку Mageia."
 
 #. 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>."
-msgstr "Ещё больше информации доступно в <link ns4:href=\"https://wiki.mageia.org/en/Category:Documentation\">вики Mageia</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+msgstr ""
+"Ещё больше информации доступно в <link ns4:href=\"https://wiki.mageia.org/en/"
+"Category:Documentation\">вики Mageia</link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr "Выбор источника (Nonfree)"
 
-#.  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
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/media_selection.xml:18
 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 "Здесь вы видите список доступных репозиториев. Не все репозитории доступны. Список доступных репозиториев зависит от носителя, которым вы воспользовались для установки. Набор репозиториев определяет, какие из пакетов будут доступны для выбора на последующих шагах."
+msgstr ""
+"Здесь вы видите список доступных репозиториев. Не все репозитории доступны. "
+"Список доступных репозиториев зависит от носителя, которым вы "
+"воспользовались для установки. Набор репозиториев определяет, какие из "
+"пакетов будут доступны для выбора на последующих шагах."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:25
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
-msgstr "Репозиторий <emphasis>Core</emphasis> нельзя выключать, поскольку в нем содержатся основные пакеты дистрибутива."
+msgstr ""
+"Репозиторий <emphasis>Core</emphasis> нельзя выключать, поскольку в нем "
+"содержатся основные пакеты дистрибутива."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:30
 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 "В репозиторий <emphasis>Nonfree</emphasis> включены пакеты, которые являются бесплатными, то есть Mageia может распространять их, но в них содержится программное обеспечение с закрытым кодом (отсюда и название - Nonfree). В этом репозитории, например, содержатся пакеты закрытых драйверов к графическим картам nVidia и ATI, прошивки для различных карт WiFi и т. п."
+msgstr ""
+"В репозиторий <emphasis>Nonfree</emphasis> включены пакеты, которые являются "
+"бесплатными, то есть Mageia может распространять их, но в них содержится "
+"программное обеспечение с закрытым кодом (отсюда и название - Nonfree). В "
+"этом репозитории, например, содержатся пакеты закрытых драйверов к "
+"графическим картам nVidia и ATI, прошивки для различных карт WiFi и т. п."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:38
 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."
-msgstr "В репозитории <emphasis>Tainted</emphasis> хранятся пакеты, выпущенные в соответствии со свободными лицензионными соглашениями. Основным критерием для включения пакетов в этот репозиторий является то, что их распространение ограничивается патентным законодательством и законами об авторских и смежных правах некоторых стран. В этот репозиторий в частности включены мультимедийные кодеки, необходимые для воспроизведения различных звуковых и видео файлов; пакеты, необходимые для воспроизведения коммерческих видео-DVD и т. п."
+"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."
+msgstr ""
+"В репозитории <emphasis>Tainted</emphasis> хранятся пакеты, выпущенные в "
+"соответствии со свободными лицензионными соглашениями. Основным критерием "
+"для включения пакетов в этот репозиторий является то, что их распространение "
+"ограничивается патентным законодательством и законами об авторских и смежных "
+"правах некоторых стран. В этот репозиторий в частности включены "
+"мультимедийные кодеки, необходимые для воспроизведения различных звуковых и "
+"видео файлов; пакеты, необходимые для воспроизведения коммерческих видео-DVD "
+"и т. п."
 
 #. type: Content of: <section><info><title>
 #: en/minimal-install.xml:12
@@ -2118,16 +2788,21 @@ msgstr "Минимальная установка"
 #: en/minimal-install.xml:19
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref "
-"linkend=\"choosePackageGroups\"></xref>."
-msgstr "Вы можете выбрать «Минимальная установка» снятием отметок по всем пунктам в списке выбора групп пакетов, см. раздел <xref linkend=\"choosePackageGroups\"></xref>."
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
+"xref>."
+msgstr ""
+"Вы можете выбрать «Минимальная установка» снятием отметок по всем пунктам в "
+"списке выбора групп пакетов, см. раздел <xref linkend=\"choosePackageGroups"
+"\"></xref>."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:22
 msgid ""
 "If desired, you can additionally tick the \"Individual package selection\" "
 "option in the same screen."
-msgstr "Если нужно, вы можете выбрать дополнительно опцию «Индивидуальный выбор пакетов» на той же странице."
+msgstr ""
+"Если нужно, вы можете выбрать дополнительно опцию «Индивидуальный выбор "
+"пакетов» на той же странице."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:24
@@ -2137,32 +2812,47 @@ msgid ""
 "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>."
-msgstr "Минимальный режим предназначен для тех, кто намерен использовать <application>Mageia</application> с какой то узкоспециализированной целью, в частности как сервер или рабочую станцию узкого направления. Вам стоит пользоваться этим вариантом в сочетании с пунктом «Индивидуальный выбор пакетов», упомянутый выше, для более точной настройки списка установленных пакетов см. <xref linkend=\"choosePackagesTree\"> </xref>."
+msgstr ""
+"Минимальный режим предназначен для тех, кто намерен использовать "
+"<application>Mageia</application> с какой то узкоспециализированной целью, в "
+"частности как сервер или рабочую станцию узкого направления. Вам стоит "
+"пользоваться этим вариантом в сочетании с пунктом «Индивидуальный выбор "
+"пакетов», упомянутый выше, для более точной настройки списка установленных "
+"пакетов см. <xref linkend=\"choosePackagesTree\"> </xref>."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:29
 msgid ""
 "If you choose this installation class, then the related screen will offer "
 "you a few useful extras to install, such as documentation and X."
-msgstr "Если вы выберете этот вариант установки, на следующей странице программы вам будет предложено установить полезные дополнения системы, в частности документацию и графический сервер."
+msgstr ""
+"Если вы выберете этот вариант установки, на следующей странице программы вам "
+"будет предложено установить полезные дополнения системы, в частности "
+"документацию и графический сервер."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:31
 msgid ""
 "If selected, \"With X\" will also include IceWM as lightweight desktop "
 "environment."
-msgstr "При выборе, в категории «Вместе с X» будет также пункт IceWM, легковесная рабочая среда."
+msgstr ""
+"При выборе, в категории «Вместе с X» будет также пункт IceWM, легковесная "
+"рабочая среда."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:33
 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."
-msgstr "Базовая документация предоставляется в формате страниц man и info. В ней содержатся страницы man с <link xlink:href=\"http://www.tldp.org/manpages/man.html\"> Проект документирования Linux</link> и страницы info с <link xlink:href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils </link>."
+"contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
+"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
+"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
+"info pages."
+msgstr ""
+"Базовая документация предоставляется в формате страниц man и info. В ней "
+"содержатся страницы man с <link xlink:href=\"http://www.tldp.org/manpages/"
+"man.html\"> Проект документирования Linux</link> и страницы info с <link "
+"xlink:href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils </"
+"link>."
 
 #. type: Content of: <section><mediaobject>
 #: en/minimal-install.xml:41
@@ -2170,907 +2860,1059 @@ 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>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
 msgid "Summary of miscellaneous parameters"
 msgstr "Резюме относительно других параметров"
 
-#.  Started by marja on 2012 03 31
-#.  NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#.       the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by
-#. linkend="setupBootloader"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry,
-#. configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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>."
-msgstr "DrakX пытается правильно определить настройки вашей системы согласно сделанного вами выбора и выявленного через DrakX оборудования. Вы можете ознакомиться с выбранными параметрами и, если нужно, изменить: для этого достаточно нажать кнопку <guibutton>Настроить</guibutton>."
+msgstr ""
+"DrakX пытается правильно определить настройки вашей системы согласно "
+"сделанного вами выбора и выявленного через DrakX оборудования. Вы можете "
+"ознакомиться с выбранными параметрами и, если нужно, изменить: для этого "
+"достаточно нажать кнопку <guibutton>Настроить</guibutton>."
+
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Параметры системы"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Часовой пояс</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected 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\"/>"
+"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:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Страна / Регион</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
-msgstr "Если вы находитесь не в той стране, которая была выбрана автоматически, очень важно исправить значение этого параметра. См. <xref linkend=\"selectCountry\"/>"
+msgstr ""
+"Если вы находитесь не в той стране, которая была выбрана автоматически, "
+"очень важно исправить значение этого параметра. См. <xref linkend="
+"\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Загрузчик</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX автоматически выбирает соответствующие параметры загрузчика."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
-msgstr "Не вносите никаких изменений, если вы не являетесь знатоком в настройках Grub и/или Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
+msgstr ""
+"Не вносите никаких изменений, если вы не являетесь знатоком в настройках "
+"Grub и/или Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
-msgstr "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"setupBootloader\"/>"
+msgstr ""
+"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Управление учетными записями</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
-"You can add extra users here. They will each get their own "
-"<literal>/home</literal> directories."
-msgstr "С помощью этой страницы вы можете добавить учетные записи пользователей. У каждого пользователя будет свой ​​каталог <literal>/home</literal>."
+"You can add extra users here. They will each get their own <literal>/home</"
+"literal> directories."
+msgstr ""
+"С помощью этой страницы вы можете добавить учетные записи пользователей. У "
+"каждого пользователя будет свой ​​каталог <literal>/home</literal>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Службы</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
-msgstr "Системными службами называются те небольшие программы, которые работают в фоновом режиме (фоновые службы). С помощью этого инструмента вы сможете включить или отключить некоторые из этих служб."
+msgstr ""
+"Системными службами называются те небольшие программы, которые работают в "
+"фоновом режиме (фоновые службы). С помощью этого инструмента вы сможете "
+"включить или отключить некоторые из этих служб."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
-msgstr "Вам следует быть осторожными в выборе: ошибки могут привести к ухудшению работы компьютера."
+msgstr ""
+"Вам следует быть осторожными в выборе: ошибки могут привести к ухудшению "
+"работы компьютера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
-msgstr "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureServices\"/>."
+msgstr ""
+"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureServices"
+"\"/>."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Параметры оборудования"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Клавиатура</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
-msgstr "С помощью этого раздела можно настроить или изменить раскладку клавиатуры, параметры которой будут зависеть от места вашего расположения, языка и типа клавиатуры."
+msgstr ""
+"С помощью этого раздела можно настроить или изменить раскладку клавиатуры, "
+"параметры которой будут зависеть от места вашего расположения, языка и типа "
+"клавиатуры."
+
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Мышь</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
-msgstr "С помощью этого раздела можно настроить координатные устройства, планшеты, шаровые манипуляторы и т.д."
+msgstr ""
+"С помощью этого раздела можно настроить координатные устройства, планшеты, "
+"шаровые манипуляторы и т.д."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Звуковая плата</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
+"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."
-msgstr "Инсталлятор использует драйвер по умолчанию, если он всего один и при этом дефолтный. Опция выбора другого драйвера предоставлена только когда у вас более одного драйвера для вашей карты, но ни один из них не является дефолтным."
+msgstr ""
+"Инсталлятор использует драйвер по умолчанию, если он всего один и при этом "
+"дефолтный. Опция выбора другого драйвера предоставлена только когда у вас "
+"более одного драйвера для вашей карты, но ни один из них не является "
+"дефолтным."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Графический интерфейс</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
-msgid ""
-"This section allows you to configure your graphic card(s) and displays."
-msgstr "С помощью этого раздела вы можете настроить параметры работы ваших графических карт и дисплеев."
+#: en/misc-params.xml:138
+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:142
+#: en/misc-params.xml:141
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
-msgstr "Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureX_chooser\"/>."
+msgstr ""
+"Чтобы узнать больше, обратитесь к разделу <xref linkend=\"configureX_chooser"
+"\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.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><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Параметры сети и Интернета"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Сеть</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
-msgstr "В этом разделе вы можете настроить сеть. Впрочем, если вы используете закрытые драйвера для сетевой карты, то лучше сделать настройку после установки системы в  <application>Центре управления Mageia</application>, после включения репозиториев закрытых (nonfree) пакетов, если вы не сделали это на предыдущем шаге."
+msgstr ""
+"В этом разделе вы можете настроить сеть. Впрочем, если вы используете "
+"закрытые драйвера для сетевой карты, то лучше сделать настройку после "
+"установки системы в  <application>Центре управления Mageia</application>, "
+"после включения репозиториев закрытых (nonfree) пакетов, если вы не сделали "
+"это на предыдущем шаге."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
-msgstr "При добавлении сетевой карты не забудьте вместе с ней настроить брандмауэр (сетевой экран), который будет следить за соответствующим интерфейсом."
+msgstr ""
+"При добавлении сетевой карты не забудьте вместе с ней настроить брандмауэр "
+"(сетевой экран), который будет следить за соответствующим интерфейсом."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Прокси</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
 "proxy service."
-msgstr "Прокси-сервер является промежуточным звеном между компьютером и интернетом. С помощью этого раздела вы можете настроить компьютер на использование служб прокси-сервера."
+msgstr ""
+"Прокси-сервер является промежуточным звеном между компьютером и интернетом. "
+"С помощью этого раздела вы можете настроить компьютер на использование служб "
+"прокси-сервера."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
-"You may need to consult your systems administrator to get the parameters you"
-" need to enter here"
-msgstr "Вам стоит посоветоваться с вашим системным администратором, чтобы узнать больше о значении параметров, которые следует указать в этом разделе."
+"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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Безопасность"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Уровень безопасности</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
-"Here you set the Security level for your computer, in most cases the default"
-" setting (Standard) is adequate for general use."
-msgstr "С помощью этого раздела вы можете определить уровень защиты вашего компьютера. В основном, дефолтный вариант (Стандартный) предоставит вашему компьютеру достаточную защиту."
+"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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
-msgstr "Выберите тот из вариантов, который лучше всего соответствует вашему образу использования системы."
+msgstr ""
+"Выберите тот из вариантов, который лучше всего соответствует вашему образу "
+"использования системы."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Файервол</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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 "Файервол или сетевой экран является барьером, который защищает важные данные от доступа к ним мошенников из интернета, пытающихся похитить и воспользоваться этими данными."
+msgstr ""
+"Файервол или сетевой экран является барьером, который защищает важные данные "
+"от доступа к ним мошенников из интернета, пытающихся похитить и "
+"воспользоваться этими данными."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
-msgstr "Выберите службы, которым доступ к вашей системе должен быть разрешен. Выбор служб зависит от назначения компьютера, на котором работает операционная система."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
+msgstr ""
+"Выберите службы, которым доступ к вашей системе должен быть разрешен. Выбор "
+"служб зависит от назначения компьютера, на котором работает операционная "
+"система."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
 #: en/misc-params.xml:222
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
-msgstr "Помните, что включение доступа без ограничений (выключение файервола) может значительно снизить уровень защиты вашей системы."
+msgstr ""
+"Помните, что включение доступа без ограничений (выключение файервола) может "
+"значительно снизить уровень защиты вашей системы."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Перезагрузка"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"После того, как загрузчик был установлен, вам будет предложено остановить "
+"ваш компьютер, удалить live CD и перезагрузить компьютер. При перезагрузке "
+"вы увидите прогресс бары успеха загрузки. Они указывают, что источник "
+"программ загружен (см. Управление программным обеспечением)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you"
-" will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
-msgstr "После того, как загрузчик был установлен, вам будет предложено остановить ваш компьютер, удалить live CD и перезагрузить компьютер. При перезагрузке вы увидите прогресс бары успеха загрузки. Они указывают, что источник программ загружен (см. Управление программным обеспечением)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+"После того, как загрузчик был установлен, вам будет предложено остановить "
+"ваш компьютер, удалить live CD и перезагрузить компьютер. При перезагрузке "
+"вы увидите прогресс бары успеха загрузки. Они указывают, что источник "
+"программ загружен (см. Управление программным обеспечением)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
 "Resize <application>Windows<superscript>®</superscript></application> "
 "partition"
-msgstr "Изменение размеров раздела <application>Windows<superscript>®</superscript></application>"
+msgstr ""
+"Изменение размеров раздела <application>Windows<superscript>®</superscript></"
+"application>"
 
 #. 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 "
+"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 ""
+"В вашей системе несколько разделов <application>Windows<superscript>®</"
+"superscript></application>. Выберите один из них, тот, который следует "
+"уменьшить в размерах, чтобы получить достаточно места для установки "
 "<application>Mageia</application>."
-msgstr "В вашей системе несколько разделов <application>Windows<superscript>®</superscript></application>. Выберите один из них, тот, который следует уменьшить в размерах, чтобы получить достаточно места для установки <application>Mageia</application>."
 
 #. type: Content of: <section><info><title>
 #: en/securityLevel.xml:12
 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:19
 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>"
+"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>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
 msgid "You can adjust your security level here."
-msgstr "С помощью этой страницы вы можете изменить уровень защиты вашей системы."
+msgstr ""
+"С помощью этой страницы вы можете изменить уровень защиты вашей системы."
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:27
 msgid ""
 "Leave the default settings as they are, if you don't know what to choose."
-msgstr "Если вы не уверены в нужных для вас параметрах, лучше не меняйте их дефолтные значения."
+msgstr ""
+"Если вы не уверены в нужных для вас параметрах, лучше не меняйте их "
+"дефолтные значения."
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:30
 msgid ""
 "After install, it will always be possible to adjust your security settings "
 "in the <guilabel>Security</guilabel> part of the Mageia Control Center."
-msgstr "После установки вы всегда сможете изменить параметры защиты с помощью модуля <guilabel>Безопасность</guilabel> в Центре управления Mageia."
+msgstr ""
+"После установки вы всегда сможете изменить параметры защиты с помощью модуля "
+"<guilabel>Безопасность</guilabel> в Центре управления Mageia."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Выбор и использование образов ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Введение"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
-msgstr "Mageia распространяется через образы ISO. Эта страница поможет вам выбрать, какие образы соответствуют вашим потребностям."
+msgstr ""
+"Mageia распространяется через образы ISO. Эта страница поможет вам выбрать, "
+"какие образы соответствуют вашим потребностям."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Существует два семейства источников:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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."
-msgstr "Классическая программа установки: После загрузки с носителя будет возможность следить за процессом, позволяя выбрать что установить и как настроить вашу целевую систему. Это даёт вам максимальную гибкость при настраиваемой установке, в частности, выбрать окружение рабочего стола, которое вы будете устанавливать."
+msgstr ""
+"Классическая программа установки: После загрузки с носителя будет "
+"возможность следить за процессом, позволяя выбрать что установить и как "
+"настроить вашу целевую систему. Это даёт вам максимальную гибкость при "
+"настраиваемой установке, в частности, выбрать окружение рабочего стола, "
+"которое вы будете устанавливать."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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, не устанавливая её, чтобы увидеть, что вы получите после установки. Процесс установки проще, но вы получите меньший выбор."
+msgstr ""
+"LIVE носитель: вы можете загрузиться с носителя в реальной системе Mageia, "
+"не устанавливая её, чтобы увидеть, что вы получите после установки. Процесс "
+"установки проще, но вы получите меньший выбор."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr "Подробности приведены в следующих разделах."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Носитель"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Определение"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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."
-msgstr "Здесь мы называем носителем данных файл образа ISO, с помощью которого можно установить и/или обновить Mageia, а также любой физический носитель, на котором хранятся данные файла ISO."
+msgstr ""
+"Здесь мы называем носителем данных файл образа ISO, с помощью которого можно "
+"установить и/или обновить Mageia, а также любой физический носитель, на "
+"котором хранятся данные файла ISO."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
-"You can find them <link "
-"ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>."
-msgstr "Вы можете найти их <link ns4:href=\"http://www.mageia.org/ru/downloads/\">здесь</link>."
+"You can find them <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:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Классический носитель для установки"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Типичные возможности"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr "Эти ISO используют традиционный инсталлятор, называемый drakx."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
-msgstr "Они пригодны для установки «с нуля» или для обновления предыдущих выпусков."
+msgstr ""
+"Они пригодны для установки «с нуля» или для обновления предыдущих выпусков."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Различные носители для архитектур 32 или 64 бит."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
-msgstr "Доступ к некоторым из инструментов можно получить в экране приветствия: система восстановления, тест памяти, инструмент обнаружения оборудования."
+msgstr ""
+"Доступ к некоторым из инструментов можно получить в экране приветствия: "
+"система восстановления, тест памяти, инструмент обнаружения оборудования."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
-msgstr "При установке у Вас будет возможность добавить источники несвободного программного обеспечения."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD двойственной архитектуры"
-
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr "Пакеты обеих архитектур присутствуют на одном носителе данных, выбор архитектуры будет сделан автоматически на основе данных об обнаруженном процессоре."
-
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Только рабочий стол XFCE."
-
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr "Только некоторые языки (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk) БЫЛИ ПРОВЕРЕНЫ!"
-
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Он содержит несвободное программное обеспечение."
+msgstr ""
+"При установке у Вас будет возможность добавить источники несвободного "
+"программного обеспечения."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live носитель"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
-msgstr "Можно воспользоваться для ознакомления с дистрибутивом без установки его на жёсткий диск и опционально установить Mageia на ваш жёсткий диск."
+msgstr ""
+"Можно воспользоваться для ознакомления с дистрибутивом без установки его на "
+"жёсткий диск и опционально установить Mageia на ваш жёсткий диск."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Каждый ISO содержит только одну рабочую среду (KDE или GNOME)."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "Различные носители для архитектур 32 или 64 бит."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous "
-"releases.</emphasis>"
-msgstr "<emphasis role=\"bold\">Live образами ISO можно пользоваться только для установки системы «с нуля». Они непригодны для обновления системы с предыдущих выпусков.</emphasis>"
+"installations, they cannot be used to upgrade from previous releases.</"
+"emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Live образами ISO можно пользоваться только для "
+"установки системы «с нуля». Они непригодны для обновления системы с "
+"предыдущих выпусков.</emphasis>"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Они содержат несвободное программное обеспечение."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Только рабочая среда KDE."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Только английский язык."
-
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Только 32 бит."
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Присутствуют все языки."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Только рабочая среда GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Присутствуют все языки."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Только рабочая среда KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Носители CD только для загрузки"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:192
 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."
-msgstr "Каждый из таких малых образов содержит минимум данных, необходимых для работы инсталлятора drakx и поиска drakx-installer-stage2, и другие пакеты, которые нужны для продолжения и завершения установки. Такие пакеты могут находиться на жёстком диске компьютера, локальном диске, в локальной сети или в интернете."
+"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."
+msgstr ""
+"Каждый из таких малых образов содержит минимум данных, необходимых для "
+"работы инсталлятора drakx и поиска drakx-installer-stage2, и другие пакеты, "
+"которые нужны для продолжения и завершения установки. Такие пакеты могут "
+"находиться на жёстком диске компьютера, локальном диске, в локальной сети "
+"или в интернете."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:201
 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."
-msgstr "Такие носители очень маленькие (менее 100 МБ). Ими удобно пользоваться, если канал связи в сети слишком узкий для загрузки полноценного образа DVD, на компьютерах без привода DVD или на компьютерах, которые не могут загружать систему с флэш-диска USB."
+msgstr ""
+"Такие носители очень маленькие (менее 100 МБ). Ими удобно пользоваться, если "
+"канал связи в сети слишком узкий для загрузки полноценного образа DVD, на "
+"компьютерах без привода DVD или на компьютерах, которые не могут загружать "
+"систему с флэш-диска USB."
+
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "Только английский язык."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Запуск установки"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
-msgstr "Содержит только свободное программное обеспечение. Предназначен для пользователей, которые не желают пользоваться несвободными пакетами."
+msgstr ""
+"Содержит только свободное программное обеспечение. Предназначен для "
+"пользователей, которые не желают пользоваться несвободными пакетами."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
-msgstr "Содержит несвободное ПО (в основном драйверы, кодеки и т.д.). Предназначен для тех, кто нуждается в этих компонентах системы."
+msgstr ""
+"Содержит несвободное ПО (в основном драйверы, кодеки и т.д.). Предназначен "
+"для тех, кто нуждается в этих компонентах системы."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Загрузка и проверка носителя данных"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Загрузка"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 the possibility to change if the bandwidth is to low. If "
+"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 the possibility to change if the bandwidth is to low. If "
 "http is chosen, you may also see something like"
-msgstr "Как только вами будет выбран нужный вам файл ISO, вы можете получить его или с помощью протокола http, или с помощью BitTorrent. В обоих случаях в окне будет показана определенная информация относительно источника данных и предоставлена ​​возможность изменить его, если скорость получения данных слишком мала. Если будет выбрано http, вы увидите нечто:"
+msgstr ""
+"Как только вами будет выбран нужный вам файл ISO, вы можете получить его или "
+"с помощью протокола http, или с помощью BitTorrent. В обоих случаях в окне "
+"будет показана определенная информация относительно источника данных и "
+"предоставлена ​​возможность изменить его, если скорость получения данных "
+"слишком мала. Если будет выбрано http, вы увидите нечто:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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 this window appears:"
-msgstr "md5sum и sha1sum - инструменты для проверки целостности ISO. Используйте только один из них. Держите один из них <link linkend=\"integrity\">для дальнейшего использования</link>. Затем появляется это окно:"
+"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
+"Then this window appears:"
+msgstr ""
+"md5sum и sha1sum - инструменты для проверки целостности ISO. Используйте "
+"только один из них. Держите один из них <link linkend=\"integrity\">для "
+"дальнейшего использования</link>. Затем появляется это окно:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Отметьте пункт «Сохранить файл»."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Проверка целостности загруженных данных"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 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."
-msgstr "Обе контрольные суммы - это шестнадцатеричные числа, рассчитанные по алгоритму из загруженного файла. Когда вы применяете эти алгоритмы чтобы пересчитать это число из загруженного файла, и у вас получается то же число, то ваш загруженный файл является правильным, но если числа отличаются, то у вас неудача. Неудача означает, что вы должны повторить загрузку."
+msgstr ""
+"Обе контрольные суммы - это шестнадцатеричные числа, рассчитанные по "
+"алгоритму из загруженного файла. Когда вы применяете эти алгоритмы чтобы "
+"пересчитать это число из загруженного файла, и у вас получается то же число, "
+"то ваш загруженный файл является правильным, но если числа отличаются, то у "
+"вас неудача. Неудача означает, что вы должны повторить загрузку."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
-msgstr "Откройте консоль (от имени обычного пользователя) и дайте следующую команду:"
+msgstr ""
+"Откройте консоль (от имени обычного пользователя) и дайте следующую команду:"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum "
-"path/to/the/image/file.iso</userinput>."
-msgstr "- При использовании md5sum: [sam@localhost]$ <userinput>md5sum путь/до/файла/образа/file.iso</userinput>."
+"- To use md5sum, type: [sam@localhost]$ <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:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum "
-"path/to/the/image/file.iso</userinput>."
-msgstr "- При использовании sha1sum: [sam@localhost]$ <userinput>sha1sum путь/до/файла/образа/file.iso</userinput>."
+"- To use sha1sum, type: [sam@localhost]$ <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:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
-"and compare the obtained number on your computer (you may have to wait for a"
-" while) with the number given by Mageia. Example:"
-msgstr "и сравните полученное числовое значение (для его получения потребуется определённое время) с числом, указанным на странице Mageia. Пример:"
+"and compare the obtained number on your computer (you may have to wait for a "
+"while) with the number given by Mageia. Example:"
+msgstr ""
+"и сравните полученное числовое значение (для его получения потребуется "
+"определённое время) с числом, указанным на странице Mageia. Пример:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Запись образа ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
-msgstr "Проверенный образ ISO можно записать на компакт-диск, DVD или флешку USB. Действие записи не является простым копированием, - она предназначена для создания загрузочного носителя."
+msgstr ""
+"Проверенный образ ISO можно записать на компакт-диск, DVD или флешку USB. "
+"Действие записи не является простым копированием, - она предназначена для "
+"создания загрузочного носителя."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr "Записать ISO на CD/DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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>."
-msgstr "Воспользуйтесь любым устройством для записи, но его необходимо настроить на <emphasis role=\"bold\">запись образа</emphasis>. Просто записать данные или файлы недостаточно. Подробнее об этом можно узнать из <link ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">вики Mageia</link>."
+"not correct. There is more information in <link ns4:href=\"https://wiki."
+"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+msgstr ""
+"Воспользуйтесь любым устройством для записи, но его необходимо настроить на "
+"<emphasis role=\"bold\">запись образа</emphasis>. Просто записать данные или "
+"файлы недостаточно. Подробнее об этом можно узнать из <link ns4:href="
+"\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">вики Mageia</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "Запись образа ISO на USB флешку"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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 "Все образы ISO Mageia являются гибридными, т.е. вы можете записывать их на USB флешку и пользоваться ею для загрузки и установки системы."
+msgstr ""
+"Все образы ISO Mageia являются гибридными, т.е. вы можете записывать их на "
+"USB флешку и пользоваться ею для загрузки и установки системы."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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."
-msgstr "В результате «записи» образа на диск USB (флешку) все данные файловой системы на ней будут уничтожены. Доступ ко всем данным, которые не будут уничтожены, будут потеряны. Размер диска будет уменьшен на размер образа."
+msgstr ""
+"В результате «записи» образа на диск USB (флешку) все данные файловой "
+"системы на ней будут уничтожены. Доступ ко всем данным, которые не будут "
+"уничтожены, будут потеряны. Размер диска будет уменьшен на размер образа."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
-msgstr "Для восстановления первоначальной ёмкости диска USB вам впоследствии придётся его форматировать."
+msgstr ""
+"Для восстановления первоначальной ёмкости диска USB вам впоследствии "
+"придётся его форматировать."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr "Использование графического инструмента внутри Mageia"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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 "Вы можете воспользоваться инструментом с графическим интерфейсом, например <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 ""
+"Вы можете воспользоваться инструментом с графическим интерфейсом, например "
+"<link ns4:href=\"https://wiki.mageia.org/en/"
+"IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr "Использование графического инструмента внутри Windows"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Вы можете попробовать:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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\";"
+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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <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>"
+msgstr ""
+"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr "Использование командной строки внутри системы GNU/Linux"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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 "Это потенциально *опасно* делать это вручную. Вы рискуете перезаписать раздел диска, если вы неправильно получите идентификатор устройства."
+msgstr ""
+"Это потенциально *опасно* делать это вручную. Вы рискуете перезаписать "
+"раздел диска, если вы неправильно получите идентификатор устройства."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Откройте окно консоли"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
-msgstr "Получите права пользователя root с помощью команды <userinput>su -</userinput> (не забудьте «-» в конце команды)"
+msgstr ""
+"Получите права пользователя root с помощью команды <userinput>su -</"
+"userinput> (не забудьте «-» в конце команды)"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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 "Соедините с компьютером ваш диск USB (не монтируйте его, т.е. не открывайте содержимое диска в любой программе, в частности в программе для управления файлами)"
+msgstr ""
+"Соедините с компьютером ваш диск USB (не монтируйте его, т.е. не открывайте "
+"содержимое диска в любой программе, в частности в программе для управления "
+"файлами)"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:394
 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:"
-msgstr "В качестве альтернативы вы можете получить имя устройства с помощью команды <code>dmesg</code>: в конце вы увидите имя устройства, начинающегося с <emphasis>sd</emphasis>, и<emphasis>sdd</emphasis> в этом случае:"
+"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:"
+msgstr ""
+"В качестве альтернативы вы можете получить имя устройства с помощью команды "
+"<code>dmesg</code>: в конце вы увидите имя устройства, начинающегося с "
+"<emphasis>sd</emphasis>, и<emphasis>sdd</emphasis> в этом случае:"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3091,114 +3933,160 @@ msgid ""
 "[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through\n"
 "[72595.967251]  <emphasis>sdd</emphasis>: sdd1\n"
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
-msgstr "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n[72594.770536] usb 1-1: Product: Mass Storage Device\n[72594.770537] usb 1-1: Manufacturer: JetFlash\n[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n[72594.772447] scsi host8: usb-storage 1-1:1.0\n[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through\n[72595.967251]  <emphasis>sdd</emphasis>: sdd1\n[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
+msgstr ""
+"[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
+"[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
+"[72594.770536] usb 1-1: Product: Mass Storage Device\n"
+"[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
+"[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
+"[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
+"[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
+"[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
+"[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
+"[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through\n"
+"[72595.967251]  <emphasis>sdd</emphasis>: sdd1\n"
+"[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:460
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:420
 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."
+"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."
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
-msgstr "Введите команду: # <userinput>dd if=путь/до/файла/образа/file of=/dev/sdX bs=1M</userinput>"
+msgstr ""
+"Введите команду: # <userinput>dd if=путь/до/файла/образа/file of=/dev/sdX "
+"bs=1M</userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Где X=имя вашего устройства, например: /dev/sdc"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
+"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
+"dev/sdb bs=1M</userinput>"
+msgstr ""
+"Например: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
-msgstr "Например: # <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><para>
-#: en/SelectAndUseISOs2.xml:477
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Введите команду: # <userinput>sync</userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Извлеките флешку USB. Запись завершена."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Выбор страны и региона"
 
-#.  2012-12-25 marja - moved this section out of misc-params
-#.  2013-05-05 marja - added screenshot
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.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/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
-msgstr "Выберите страну или регион. Ваш выбор будет важным для всех типов параметров локализации системы, в частности выбора валюты и домена управления беспроводной связью. Ложный выбор может привести к невозможности использования беспроводной связи."
+msgstr ""
+"Выберите страну или регион. Ваш выбор будет важным для всех типов параметров "
+"локализации системы, в частности выбора валюты и домена управления "
+"беспроводной связью. Ложный выбор может привести к невозможности "
+"использования беспроводной связи."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
-msgstr "Если вашей страны нет в списке, нажмите кнопку <guilabel>Другие страны</guilabel> и выберите страну или регион в окне, которое будет открыто."
+"If your country isn't in the list, click the <guilabel>Other Countries</"
+"guilabel> button and choose your country / region there."
+msgstr ""
+"Если вашей страны нет в списке, нажмите кнопку <guilabel>Другие страны</"
+"guilabel> и выберите страну или регион в окне, которое будет открыто."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
 "choice."
-msgstr "Если пункт вашей страны есть только в списке <guilabel>Другие страны</guilabel> может показаться, что выбрана страна из первого списка. Пожалуйста, не обращайте на это внимание, DrakX уже учел ваш правильный выбор."
+msgstr ""
+"Если пункт вашей страны есть только в списке <guilabel>Другие страны</"
+"guilabel> может показаться, что выбрана страна из первого списка. "
+"Пожалуйста, не обращайте на это внимание, DrakX уже учел ваш правильный "
+"выбор."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Способ ввода"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method"
-" so users should not need to configure it manually. 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> вы можете выбрать способ ввода (с помощью нижней части списка). Способы ввода дают возможность пользователям вводить символы разных восточных языков (китайского, японского, корейского и т.п.). Типичным способом ввода на DVD с Mageia и портативных образах системы для Африки/Индии и Азии есть IBus. Для локалей азиатских и африканских стран IBus будет определен типичным способом ввода, следовательно пользователям не придется настраивать ничего вручную. Другие способы ввода (SCIM, GCIN, HIME т.п.), которые предоставляют пользователям подобные возможности, можно установить, если перед выбором пакетов были добавлены репозитории пакетов HTTP/FTP."
+"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 "
+"and can be installed if you added HTTP/FTP media before package selection."
+msgstr ""
+"С помощью окна <guilabel>Другие страны</guilabel> вы можете выбрать способ "
+"ввода (с помощью нижней части списка). Способы ввода дают возможность "
+"пользователям вводить символы разных восточных языков (китайского, "
+"японского, корейского и т.п.). Типичным способом ввода на DVD с Mageia и "
+"портативных образах системы для Африки/Индии и Азии есть IBus. Для локалей "
+"азиатских и африканских стран IBus будет определен типичным способом ввода, "
+"следовательно пользователям не придется настраивать ничего вручную. Другие "
+"способы ввода (SCIM, GCIN, HIME т.п.), которые предоставляют пользователям "
+"подобные возможности, можно установить, если перед выбором пакетов были "
+"добавлены репозитории пакетов HTTP/FTP."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
-msgstr "Если вы пропустили настройки ввода во время установки, вы можете получить доступ к ним после загрузки установленной системы в меню «Настроить компьютер» -&gt; «Система» или запустите localedrake от имени пользователя root."
+msgstr ""
+"Если вы пропустили настройки ввода во время установки, вы можете получить "
+"доступ к ним после загрузки установленной системы в меню «Настроить "
+"компьютер» -&gt; «Система» или запустите localedrake от имени пользователя "
+"root."
 
 #. type: Content of: <section><info><title>
 #: en/selectInstallClass.xml:21
@@ -3208,9 +4096,11 @@ msgstr "Установка или обновление"
 #. type: Content of: <section><mediaobject>
 #: en/selectInstallClass.xml:25
 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>"
+"<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>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:32
@@ -3221,7 +4111,9 @@ msgstr "Установка"
 #: en/selectInstallClass.xml:34
 msgid ""
 "Use this option for a fresh <application>Mageia</application> installation."
-msgstr "Этим вариантом следует воспользоваться, если вы хотите установить <application>Mageia</application> с нуля."
+msgstr ""
+"Этим вариантом следует воспользоваться, если вы хотите установить "
+"<application>Mageia</application> с нуля."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:39
@@ -3234,7 +4126,10 @@ 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>, то программа установки предоставит вам возможность обновить одну из установленных систем до последней версии."
+msgstr ""
+"Если на компьютере установлена ​​одна или несколько предыдущих версий "
+"<application>Mageia</application>, то программа установки предоставит вам "
+"возможность обновить одну из установленных систем до последней версии."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
 #: en/selectInstallClass.xml:45
@@ -3242,31 +4137,49 @@ 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."
-msgstr "Было тщательно проверено только обновление с предыдущей версии Mageia, которая <emphasis>всё ещё поддерживалась</emphasis>, когда эта версия инсталлятора была выпущена. Если вы хотите обновить версию Mageia, которая уже больше не поддерживается,\t то лучше выполнить чистую установку, сохранив только раздел <literal>/home</literal>."
+"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."
+msgstr ""
+"Было тщательно проверено только обновление с предыдущей версии Mageia, "
+"которая <emphasis>всё ещё поддерживалась</emphasis>, когда эта версия "
+"инсталлятора была выпущена. Если вы хотите обновить версию Mageia, которая "
+"уже больше не поддерживается,\t то лучше выполнить чистую установку, "
+"сохранив только раздел <literal>/home</literal>."
 
 #. type: Content of: <section><note><para>
 #: en/selectInstallClass.xml:56
 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 "
-"Delete</guilabel> simultaneously to reboot."
-msgstr "Если в течение процедуры установки вы решите прекратить установку, то вы можете перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши действия. После форматирования раздела или начала процедуры установки обновлений компьютер находиться в промежуточном состоянии. Перезагрузка может привести к невозможности пользования системой. Если, вопреки этим предупреждением, вы хотите перезагрузить систему, перейдите в текстовый терминал нажатием комбинации этих трех клавиш: <guilabel>Alt Ctrl F2</guilabel> одновременно. После этого нажмите комбинацию клавиш <guilabel>Alt Ctrl Delete</guilabel> одновременно, чтобы перезагрузить компьютер."
+"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."
+msgstr ""
+"Если в течение процедуры установки вы решите прекратить установку, то вы "
+"можете перезагрузить компьютер. Впрочем, вам следует тщательно обдумать ваши "
+"действия. После форматирования раздела или начала процедуры установки "
+"обновлений компьютер находиться в промежуточном состоянии. Перезагрузка "
+"может привести к невозможности пользования системой. Если, вопреки этим "
+"предупреждением, вы хотите перезагрузить систему, перейдите в текстовый "
+"терминал нажатием комбинации этих трех клавиш: <guilabel>Alt Ctrl F2</"
+"guilabel> одновременно. После этого нажмите комбинацию клавиш <guilabel>Alt "
+"Ctrl Delete</guilabel> одновременно, чтобы перезагрузить компьютер."
 
 #. type: Content of: <section><tip><para>
 #: en/selectInstallClass.xml:67
 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."
-msgstr "Если вы обнаружите, что забыли установить пакет дополнительного языка, вы можете вернуться со страницы «Установка или обновление» на страницу выбора языка нажатием комбинации клавиш <guilabel>Alt Ctrl Home</guilabel>. <emphasis>Не</emphasis> делайте этого во время следующих шагов установки."
+"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."
+msgstr ""
+"Если вы обнаружите, что забыли установить пакет дополнительного языка, вы "
+"можете вернуться со страницы «Установка или обновление» на страницу выбора "
+"языка нажатием комбинации клавиш <guilabel>Alt Ctrl Home</guilabel>. "
+"<emphasis>Не</emphasis> делайте этого во время следующих шагов установки."
 
 #. type: Content of: <section><info><title>
 #: en/selectKeyboardLive.xml:3
@@ -3277,17 +4190,23 @@ msgstr "Выбор клавиатуры"
 #: en/selectKeyboardLive.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. 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 "Вам потребуется установить раскладку клавиатуры, которую вы хотите использовать в Mageia. По умолчанию она выбирается в зависимости от вашего языка и часового пояса, выбранного ранее."
+msgstr ""
+"Вам потребуется установить раскладку клавиатуры, которую вы хотите "
+"использовать в Mageia. По умолчанию она выбирается в зависимости от вашего "
+"языка и часового пояса, выбранного ранее."
 
 #. type: Content of: <section><info><title>
 #: en/selectKeyboard.xml:14
@@ -3299,43 +4218,63 @@ msgstr "Клавиатура"
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
-msgstr "DrakX автоматически выбирает соответствующую раскладку клавиатуры с выбранным вами языком. Если в списке не окажется соответствующей раскладки, будет использована типичная американская раскладка US."
+msgstr ""
+"DrakX автоматически выбирает соответствующую раскладку клавиатуры с "
+"выбранным вами языком. Если в списке не окажется соответствующей раскладки, "
+"будет использована типичная американская раскладка US."
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboard.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\""
-" /> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:30
 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>"
-msgstr "Убедитесь, что программа сделала правильный выбор, или выберите другую раскладку клавиатуры. Если вы не можете определиться с нужной вам раскладкой, ознакомьтесь с документацией к компьютеру или отправьте запрос производителю. Кроме того, на некоторых из клавиатур можно найти отметку, которая содержит данные относительно раскладки клавиатуры. Также полезным может быть ознакомление с содержанием страницы: <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 ""
+"Убедитесь, что программа сделала правильный выбор, или выберите другую "
+"раскладку клавиатуры. Если вы не можете определиться с нужной вам "
+"раскладкой, ознакомьтесь с документацией к компьютеру или отправьте запрос "
+"производителю. Кроме того, на некоторых из клавиатур можно найти отметку, "
+"которая содержит данные относительно раскладки клавиатуры. Также полезным "
+"может быть ознакомление с содержанием страницы: <link xlink:href=\"http://en."
+"wikipedia.org/wiki/Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</"
+"link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:40
 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."
-msgstr "Если нужного пункта для вашей клавиатуры не будет в показанном списке, нажмите кнопку <guibutton>Еще</guibutton> для ознакомления с полным списком, из которого вы можете выбрать модель клавиатуры."
+"If your keyboard isn't in the list shown, click on <guibutton>More</"
+"guibutton> to get a full list, and select your keyboard there."
+msgstr ""
+"Если нужного пункта для вашей клавиатуры не будет в показанном списке, "
+"нажмите кнопку <guibutton>Еще</guibutton> для ознакомления с полным списком, "
+"из которого вы можете выбрать модель клавиатуры."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
 #: en/selectKeyboard.xml:45
 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 "
+"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."
-msgstr "После выбора модели клавиатуры с помощью диалогового окна <guibutton>Еще</guibutton> вы вернетесь к первому диалоговому окну выбора клавиатуры, в котором пункт клавиатуры останется прежним. Не обращайте на это внимание: средству установки уже сообщено, что вы выбрали надлежащую клавиатуры из полного списка."
+msgstr ""
+"После выбора модели клавиатуры с помощью диалогового окна <guibutton>Еще</"
+"guibutton> вы вернетесь к первому диалоговому окну выбора клавиатуры, в "
+"котором пункт клавиатуры останется прежним. Не обращайте на это внимание: "
+"средству установки уже сообщено, что вы выбрали надлежащую клавиатуры из "
+"полного списка."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:55
@@ -3343,7 +4282,10 @@ 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"
-msgstr "Если вами была выбрана раскладка с нелатинскими символами, программа покажет дополнительное диалоговое окно, с помощью которого вы сможете определиться со способом переключения между латинской и нелатинской раскладкой."
+msgstr ""
+"Если вами была выбрана раскладка с нелатинскими символами, программа покажет "
+"дополнительное диалоговое окно, с помощью которого вы сможете определиться "
+"со способом переключения между латинской и нелатинской раскладкой."
 
 #. type: Content of: <section><info><title>
 #: en/selectLanguage.xml:15
@@ -3356,40 +4298,57 @@ msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
 "the installation and for your installed system."
-msgstr "Выберите нужный язык интерфейса системы. Для этого сначала откройте список стран вашего континента. <application>Mageia</application> будет использовать этот выбор во время установки и в установленной системе."
+msgstr ""
+"Выберите нужный язык интерфейса системы. Для этого сначала откройте список "
+"стран вашего континента. <application>Mageia</application> будет "
+"использовать этот выбор во время установки и в установленной системе."
 
 #. type: Content of: <section><para>
 #: en/selectLanguage.xml:22
 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."
-msgstr "Если в системе будет использоваться несколько языков (вами или другими пользователями), нажмите кнопку <guibutton>Несколько языков</guibutton>, чтобы добавить их. После установки добавить поддержку языков будет довольно сложно."
+"<guibutton>Multiple languages</guibutton> button 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:29
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata fileref=\"live-language.png\" "
-"format=\"\"/> </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>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
 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 "
+"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 ."
-msgstr "Даже если вами было выбрано несколько языков, вам сначала необходимо выбрать один из них как основной язык страниц программы установки. Кроме того, этот язык будет отмечен и в окне выбора нескольких языков."
+msgstr ""
+"Даже если вами было выбрано несколько языков, вам сначала необходимо выбрать "
+"один из них как основной язык страниц программы установки. Кроме того, этот "
+"язык будет отмечен и в окне выбора нескольких языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:46
 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 "Если раскладка вашей клавиатуры не совпадает с раскладкой, используемой для желаемого языка, следует также установить языковые пакеты для языка, связанные с выбранной раскладкой."
+msgstr ""
+"Если раскладка вашей клавиатуры не совпадает с раскладкой, используемой для "
+"желаемого языка, следует также установить языковые пакеты для языка, "
+"связанные с выбранной раскладкой."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:52
@@ -3402,458 +4361,618 @@ 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."
-msgstr "Кодировку можно отключить в окне выбора нескольких языков, если вам заранее известно, что Unicode несовместим с вашим языком. Выключение UTF-8 касается всех установленных языков."
+msgstr ""
+"Кодировку можно отключить в окне выбора нескольких языков, если вам заранее "
+"известно, что Unicode несовместим с вашим языком. Выключение UTF-8 касается "
+"всех установленных языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:60
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
-msgstr "Изменить язык интерфейса системы после установки можно с помощью Центра управления Mageia -> Система -> Настройка локализации системы."
+msgstr ""
+"Изменить язык интерфейса системы после установки можно с помощью Центра "
+"управления Mageia -> Система -> Настройка локализации системы."
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 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 ""
 "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
 "format=\"PNG\" > </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:23
 msgid ""
 "If you are not happy with how your mouse responds, you can select a "
 "different one here."
-msgstr "Если у вас возникают проблемы с управлением курсором мыши, вы можете выбрать другой драйвер для мыши."
+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."
-msgstr "Обычно, <guilabel>Универсальная</guilabel> — <guilabel>Любая мышь PS/2 или USB</guilabel> является неплохим вариантом."
+"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
+"guilabel> is a good choice."
+msgstr ""
+"Обычно, <guilabel>Универсальная</guilabel> — <guilabel>Любая мышь PS/2 или "
+"USB</guilabel> является неплохим вариантом."
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:27
 msgid ""
 "Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
 "configure the buttons that do not work on a mouse with six or more buttons."
-msgstr "Выберете пункт <guilabel>Универсальная</guilabel> — <guilabel>Задействовать evdev</guilabel>, чтобы настроить кнопки, которые не работают для мыши с шестью или более кнопками."
+msgstr ""
+"Выберете пункт <guilabel>Универсальная</guilabel> — <guilabel>Задействовать "
+"evdev</guilabel>, чтобы настроить кнопки, которые не работают для мыши с "
+"шестью или более кнопками."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
-msgstr "Добавление пункта в меню загрузки или внесение изменений в такие пункты"
+msgstr ""
+"Добавление пункта в меню загрузки или внесение изменений в такие пункты"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
-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>"
+#. type: Content of: <section><para>
+#: 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)."
+msgstr ""
+
+#. type: Content of: <section><note><para>
+#: 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>"
+msgstr ""
+"Подробное описание параметров ядра в устаревших системах и системах с UEFI "
+"можно найти  <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">здесь</link>."
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Основные параметры загрузчика"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "С системой Bios"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Основные параметры загрузчика"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
-msgstr "Чтобы добавить запись или внести изменения в выбранную запись, нажмите соответствующую кнопку на странице <emphasis>Настройки загрузчика</emphasis>. В ответ будет показано окно редактирования."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "С системой UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>"
-" instead."
-msgstr "Если вами был выбран загрузчик <code>Grub 2</code>, тогда вы не сможете воспользоваться этим инструментом для редактирования записей на следующем шаге, после нажатия кнопки «Далее». Вам следует воспользоваться другим графическим инструментом для редактирования, в частности <code>kcm-grub2</code>, <code>grub-customizer</code>, или внести изменения в <code>/boot/grub2/custom.cfg</code > вручную."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
+msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" "
-"revision=\"1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision=\"1\"/> </imageobject>"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+"Не изменяйте \"Загрузочное устройство\", если на самом деле не знаете, что "
+"вы делаете."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "С системой UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
-msgstr "Некоторые из действий можно выполнять ничем не рискуя. К таким действиям относится изменение метки записи или обозначение дефолтной записи в списке."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
+msgstr ""
+"С EFI системой пользовательский интерфейс немного отличается, вы не можете "
+"выбрать загрузчик, так как только доступен Grub2-efi."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
-msgstr "Вы можете добавить к записи надлежащий номер версии или полностью изменить название записи."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
-msgstr "Дефолтный пункт - это пункт операционной системы, которая загружается, если пользователем не будет сделано другого выбора во время показа меню загрузки."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
-msgstr "Изменение других параметров может привести к невозможности загрузки системы. Пожалуйста, не экспериментируйте с этими параметрами, если вам достоверно неизвестно их назначение."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
+msgstr ""
+"Если Mageia - это первая система, установленная на вашем компьютере, то "
+"установщик создал ESP (Системный раздел EFI), чтобы получить начальный "
+"загрузчик (Grub2-efi). Если уже имеются UEFI операционные системы, которые "
+"были ранее установлены на вашем компьютере (Windows 8, например), то "
+"программа установки Mageia обнаружила существующий ESP, созданный Windows, и "
+"добавила grub2-efi. Несмотря на то, что можно иметь несколько ESP, "
+"рекомендуется и достаточен только один независимо от количества имеющихся у "
+"вас операционных систем."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "С системой UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Использование загрузчика Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit "
-"<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead. All you can do here, is to choose the default entry in the drop "
-"down list."
-msgstr "В этом случае вы используете Grub2-efi, и вы не можете использовать этот инструмент для редактирования записей на этом шаге. Для этого необходимо вручную отредактировать <code>/boot/grub2/custom.cfg</code> или используйте <code>grub-customizer</code> вместо этого. Всё, что вы можете сделать здесь, это выбрать запись по умолчанию в раскрывающемся списке."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
+msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
-msgstr "После щелчка по кнопке <guibutton>Далее</guibutton>, другой выпадающий список позволяет выбрать разрешение видео для Grub2, который представляет собой графический загрузчик."
+"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>"
+msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </imageobject>"
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Основные параметры загрузчика"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
-"revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
-msgstr "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Использование уже установленного загрузчика"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by"
-" the installer, you can change them here."
-msgstr "Если вам нужны другие параметры работы загрузчика, чем те, которые были выбраны автоматически программой для установки системы, вы можете изменить их с помощью этой страницы."
+"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."
+msgstr ""
+"Полный перечень шагов добавления пункта ОС Mageia в меню уже установленного "
+"загрузчика не является предметом этой справочной страницы. Впрочем, в "
+"основном, эти шаги связаны с запуском соответствующей программы установки "
+"загрузчика, которая должна выявить и добавить пункт системы в автоматическом "
+"режиме. Соответствующие пояснения должны быть приведены в документации "
+"другой операционной системы."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
+msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case"
-" you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
-msgstr "Вероятно, вы уже пользовались какой-то операционной системой на компьютере. Если это так, вам следует определиться, должен ли быть добавлен пункт Mageia к меню текущего загрузчика, или Mageia должна создать собственный загрузчик."
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Графические меню Mageia выглядят великолепно. :"
+"If you don't want a bootable Mageia, but 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>."
+msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Использование загрузчика Mageia"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
-msgstr "По умолчанию Mageia записывает новый загрузчик GRUB (устаревшую версию) в MBR (основную загрузочную запись) первого диска компьютера. Если на диске уже были установлены операционные системы, Mageia попытается добавить пункты этих операционных систем в новое меню загрузки Mageia."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
-msgstr "В новой версии Mageia вы сможете воспользоваться загрузчиком GRUB2 в дополнение к устаревшей версии GRUB и Lilo."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
+msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
-msgstr "Операционные системы Linux, в которых используется загрузчик GRUB2, в текущей версии не распознаются и не поддерживаются дефолтным загрузчиком GRUB (устаревшей версии)."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
-msgstr "Лучшим решением является использование загрузчика GRUB2. Приказать системе использовать именно этот загрузчик можно на странице «Резюме» при установке операционной системы."
+"<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."
+msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Использование уже установленного загрузчика"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader"
-" <guibutton>Configure</guibutton> button, which will allow you to change the"
-" bootloader install location."
-msgstr "Если вы решите воспользоваться уже установленным загрузчиком, не забудьте остановиться на странице «Резюме» при установке и нажать в разделе «Загрузчик» кнопку <guibutton>Настроить</guibutton>, с помощью которой вы сможете изменить место установки загрузчика."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR."
-" You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
-msgstr "Не выбирайте устройство, например «sda», иначе уже созданная запись MBR будет перезаписана. Вам следует выбрать корневой раздел, который выбран на шаге распределения диска на разделы, например «sda7»."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
+msgstr ""
+"<guilabel>Пароль (еще раз)</guilabel>: повторите ввод пароля в этом поле. "
+"DrakX проверит, совпадает ли  введенный повторно пароль с его первоначальным "
+"вариантом."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Если быть точным, sda - это устройство, а sda7 - раздел на устройстве."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Службы</guilabel>:"
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to"
-" the installer screen."
-msgstr "Перейдите на tty2 нажатием комбинации клавиш Ctrl+Alt+F2 и отдайте команду <literal>df</literal> чтобы определить расположение вашего раздела <literal>/</literal> (корневого каталога). Вернуться к окну инсталлятора можно с помощью нажатия комбинации клавиш Ctrl+Alt+F7."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
-msgstr "Полный перечень шагов добавления пункта ОС Mageia в меню уже установленного загрузчика не является предметом этой справочной страницы. Впрочем, в основном, эти шаги связаны с запуском соответствующей программы установки загрузчика, которая должна выявить и добавить пункт системы в автоматическом режиме. Соответствующие пояснения должны быть приведены в документации другой операционной системы."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
+msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Дополнительные параметры загрузчика"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on "
-"<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp "
-"at each boot</guilabel>. This helps to maintain some free space."
-msgstr "Если объем на диске с разделом <literal>/</literal>, содержащий каталог <literal>/tmp</literal>, является очень ограниченным, нажмите кнопку <guibutton>Дополнительно</guibutton> и отметьте пункт <guilabel>Очищать /tmp при каждой перезагрузке</guilabel>. Это поможет сэкономить немного места."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
+msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
-msgstr "С EFI системой пользовательский интерфейс немного отличается, вы не можете выбрать загрузчик, так как только доступен Grub2-efi."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata "
-"fileref=\"dx2-setupBootloader2.png\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> "
-"</imageobject>"
-msgstr "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
+msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi)."
-" If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing"
-" ESP created by Windows and added grub2-efi. Although it is possible to have"
-" several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
-msgstr "Если Mageia - это первая система, установленная на вашем компьютере, то установщик создал ESP (Системный раздел EFI), чтобы получить начальный загрузчик (Grub2-efi). Если уже имеются UEFI операционные системы, которые были ранее установлены на вашем компьютере (Windows 8, например), то программа установки Mageia обнаружила существующий ESP, созданный Windows, и добавила grub2-efi. Несмотря на то, что можно иметь несколько ESP, рекомендуется и достаточен только один независимо от количества имеющихся у вас операционных систем."
+"<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."
+msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "Не изменяйте \"Загрузочное устройство\", если на самом деле не знаете, что вы делаете."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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
 msgid "Setup SCSI"
 msgstr "Настройка SCSI"
 
-#.  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
 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>"
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:32
 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 "
+"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."
-msgstr "Обычно DrakX определяет параметры дисков правильно. Впрочем, если вы имеете дело с устаревшим дисковым контроллером SCSI, возможны ошибки, из-за которых программа не сможет установить нужных драйверов."
+msgstr ""
+"Обычно DrakX определяет параметры дисков правильно. Впрочем, если вы имеете "
+"дело с устаревшим дисковым контроллером SCSI, возможны ошибки, из-за которых "
+"программа не сможет установить нужных драйверов."
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:36
 msgid ""
 "If this happens, you will need to manually tell Drakx which SCSI drive(s) "
 "you have."
-msgstr "Если вам встретился именно такой контроллер, вам придется вручную сообщить DrakX, с каким диском SCSI придется иметь дело."
+msgstr ""
+"Если вам встретился именно такой контроллер, вам придется вручную сообщить "
+"DrakX, с каким диском SCSI придется иметь дело."
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:39
 msgid "DrakX should then be able to configure the drive(s) correctly."
-msgstr "После этого, DrakX сможет настроить систему на работу с дисками должным образом."
+msgstr ""
+"После этого, DrakX сможет настроить систему на работу с дисками должным "
+"образом."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Настройка звука"
 
-#.  Started by marja on 2013-12-07
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
+msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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."
-msgstr "На этом экране указан драйвер, который инсталлятор выбрал для вашей звуковой карты из имеющихся и который будет драйвером по умолчанию, если имеется только один дефолтный."
+msgstr ""
+"На этом экране указан драйвер, который инсталлятор выбрал для вашей звуковой "
+"карты из имеющихся и который будет драйвером по умолчанию, если имеется "
+"только один дефолтный."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
 "this tool via MCC (Mageia Control Center), by choosing the "
 "<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
 "Configuration</guilabel> at the top right of the screen."
-msgstr "Драйвер по умолчанию должен работать без проблем. Однако, если после установки вы столкнётесь с проблемами, то запустите <command>draksound</command> или запустите эту утилиту из MCC (Центр Управления Mageia), выбрав вкладку <guilabel>Оборудование</guilabel> и нажав <guilabel>Настройка звука</guilabel> в верхнем правом углу окна."
+msgstr ""
+"Драйвер по умолчанию должен работать без проблем. Однако, если после "
+"установки вы столкнётесь с проблемами, то запустите <command>draksound</"
+"command> или запустите эту утилиту из MCC (Центр Управления Mageia), выбрав "
+"вкладку <guilabel>Оборудование</guilabel> и нажав <guilabel>Настройка звука</"
+"guilabel> в верхнем правом углу окна."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: 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."
-msgstr "Затем в draksound или в окне утилиты \"Настройка звука\" щёлкните на <guibutton>Дополнительно</guibutton> и потом на <guibutton>Устранение неполадок</guibutton>, чтобы найти очень полезные советы о том, как решить эту проблему."
+"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
+"guibutton> to find very useful advice about how to solve the problem."
+msgstr ""
+"Затем в draksound или в окне утилиты \"Настройка звука\" щёлкните на "
+"<guibutton>Дополнительно</guibutton> и потом на <guibutton>Устранение "
+"неполадок</guibutton>, чтобы найти очень полезные советы о том, как решить "
+"эту проблему."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Дополнительно"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 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."
-msgstr "Нажатие <guibutton>Дополнительно</guibutton> в этом окне во время установки полезно, если нет драйвера по умолчанию и есть несколько доступных драйверов, но вы считаете, что инсталлятор выбрал неверный драйвер."
+msgstr ""
+"Нажатие <guibutton>Дополнительно</guibutton> в этом окне во время установки "
+"полезно, если нет драйвера по умолчанию и есть несколько доступных "
+"драйверов, но вы считаете, что инсталлятор выбрал неверный драйвер."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
-msgstr "В этом случае вы можете выбрать другой драйвер после нажатия на <guibutton>Позволить мне выбрать любой драйвер</guibutton>."
+msgstr ""
+"В этом случае вы можете выбрать другой драйвер после нажатия на "
+"<guibutton>Позволить мне выбрать любой драйвер</guibutton>."
 
 #. type: Content of: <section><info><title>
 #: en/takeOverHdConfirm.xml:4
 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
 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>"
-msgstr "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> <imageobject condition='classical'> <imagedata fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject>"
+"<imageobject condition='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>"
+msgstr ""
+"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
+"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
+"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
 msgid ""
 "Click on <guibutton>Previous</guibutton> if you are not sure about your "
 "choice."
-msgstr "Нажмите  кнопку <guibutton>Назад</guibutton>, если вы не уверены в сделанном выборе."
+msgstr ""
+"Нажмите  кнопку <guibutton>Назад</guibutton>, если вы не уверены в сделанном "
+"выборе."
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:30
 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."
-msgstr "Нажмите кнопку <guibutton>Далее</guibutton>, если вы уверены и хотите стереть все разделы, все операционные системы на диске и все данные, хранящиеся на этом диске."
+"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."
+msgstr ""
+"Нажмите кнопку <guibutton>Далее</guibutton>, если вы уверены и хотите "
+"стереть все разделы, все операционные системы на диске и все данные, "
+"хранящиеся на этом диске."
 
 #. type: Content of: <section><info><title>
 #: en/testing.xml:9
@@ -3868,14 +4987,18 @@ msgstr "Режим Live"
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
 msgid ""
 "You get this screen if you selected \"Boot Mageia\". If not, you get the "
 "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
-msgstr "Вы получите этот экран если выберите \"Загрузить Mageia\". Если нет, то вы получите шаг \"<link linkend=\"doPartitionDisks\">Разбиение на разделы</link>\""
+msgstr ""
+"Вы получите этот экран если выберите \"Загрузить Mageia\". Если нет, то вы "
+"получите шаг \"<link linkend=\"doPartitionDisks\">Разбиение на разделы</link>"
+"\""
 
 #. type: Content of: <section><section><section><info><title>
 #: en/testing.xml:28
@@ -3888,7 +5011,11 @@ msgid ""
 "One of the Live mode goals is to test if the hardware is correctly managed "
 "by Mageia. You can check if all devices have a driver in the Hardware "
 "section of the Mageia Control Center. You can test the most current devices:"
-msgstr "Одной из целей Live режима является проверка, что аппаратное обеспечение правильно управляется Mageia. Вы можете проверить, все ли устройства имеют драйвера в разделе аппаратного обеспечения Центра управления Mageia. Вы можете протестировать самые современные устройства:"
+msgstr ""
+"Одной из целей Live режима является проверка, что аппаратное обеспечение "
+"правильно управляется Mageia. Вы можете проверить, все ли устройства имеют "
+"драйвера в разделе аппаратного обеспечения Центра управления Mageia. Вы "
+"можете протестировать самые современные устройства:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/testing.xml:38
@@ -3925,13 +5052,15 @@ msgstr "сканер: отсканировать документ из ..."
 msgid ""
 "If all is OK for you, you can process to the installation. If not, you can "
 "leave with the quit button."
-msgstr "Если всё хорошо для вас, то вы можете начать установку. Если нет, то вы можете выйти кнопкой выхода."
+msgstr ""
+"Если всё хорошо для вас, то вы можете начать установку. Если нет, то вы "
+"можете выйти кнопкой выхода."
 
 #. type: Content of: <section><section><section><remark>
 #: en/testing.xml:66
-msgid ""
-"The configuration settings you made here are kept for the installation."
-msgstr "Параметры конфигурации, которые вы здесь сделали, сохраняются для установки."
+msgid "The configuration settings you made here are kept for the installation."
+msgstr ""
+"Параметры конфигурации, которые вы здесь сделали, сохраняются для установки."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/testing.xml:72
@@ -3941,19 +5070,24 @@ msgstr "Запуск установки"
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
 msgid ""
 "To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
 "SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link "
-"linkend=\"doPartitionDisks\">Partitioning</link> step\" as for the direct "
-"installation."
-msgstr "Для того, чтобы запустить установку Mageia с Live CD или Live DVD на жёсткий диск или SSD-диск, просто нажмите на иконку \"Установить на жёсткий диск\". Вы получите этот экран, а затем шаг \"<link linkend=\"doPartitionDisks\">Разбиение на разделы</link>\" как для непосредственной установки."
+"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
+"link> step\" as for the direct installation."
+msgstr ""
+"Для того, чтобы запустить установку Mageia с Live CD или Live DVD на жёсткий "
+"диск или SSD-диск, просто нажмите на иконку \"Установить на жёсткий диск\". "
+"Вы получите этот экран, а затем шаг \"<link linkend=\"doPartitionDisks"
+"\">Разбиение на разделы</link>\" как для непосредственной установки."
 
 #. type: Content of: <section><info><title>
 #: en/uninstall-Mageia.xml:3
@@ -3961,54 +5095,81 @@ msgid "Uninstalling Mageia"
 msgstr "Удаление Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Руководство"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
 "possibility to uninstall. This is not true for every operating system."
-msgstr "Если Mageia не удовлетворяет вашим потребностям или вы не смогли должным образом установить систему, у вас может возникнуть потребность в удалении дистрибутива. Это ваше право, и в Mageia предусмотрена возможность удаления системы. Такую возможность можно найти не в каждой операционной системе."
+msgstr ""
+"Если Mageia не удовлетворяет вашим потребностям или вы не смогли должным "
+"образом установить систему, у вас может возникнуть потребность в удалении "
+"дистрибутива. Это ваше право, и в Mageia предусмотрена возможность удаления "
+"системы. Такую возможность можно найти не в каждой операционной системе."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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."
-msgstr "После создания резервной копии данных, перезагрузите систему с DVD Mageia и выберите пункт «Rescue system/Спасение системы», далее «Restore Windows boot loader/Восстановить загрузчик Windows». При следующей загрузке системы загрузится только Windows без всяких окон выбора операционной системы."
+"Rescue system, then, Restore Windows boot loader. 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:20
+#: en/uninstall-Mageia.xml:22
 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. "
+"<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."
-msgstr "Чтобы воспользоваться местом на диске, которое некогда было занято разделами Mageia, в Windows, воспользуйтесь пунктом меню <code>Пуск -> Панель управления -> Средства администрирования -> Управление компьютером -> Хранилища данных -> Управление дисками</code>. В ответ должна быть открыта страница управления разделами. Раздел, куда была установлена Mageia, можно определить по метке <guilabel>Неизвестный</guilabel>, а также по размеру и расположению на диске. Щелкните правой кнопкой мыши на таком разделе и выберите пункт <guibutton>Удалить</guibutton>. После этого место на диске будет освобождено."
+"Right click on each of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
+msgstr ""
+"Чтобы воспользоваться местом на диске, которое некогда было занято разделами "
+"Mageia, в Windows, воспользуйтесь пунктом меню <code>Пуск -> Панель "
+"управления -> Средства администрирования -> Управление компьютером -> "
+"Хранилища данных -> Управление дисками</code>. В ответ должна быть открыта "
+"страница управления разделами. Раздел, куда была установлена Mageia, можно "
+"определить по метке <guilabel>Неизвестный</guilabel>, а также по размеру и "
+"расположению на диске. Щелкните правой кнопкой мыши на таком разделе и "
+"выберите пункт <guibutton>Удалить</guibutton>. После этого место на диске "
+"будет освобождено."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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 "Если на компьютере установлена Windows XP, вы можете создать новый раздел и выполнить его форматирование (в FAT32 или NTFS). Система предоставит ему соответствующую букву диска."
+msgstr ""
+"Если на компьютере установлена Windows XP, вы можете создать новый раздел и "
+"выполнить его форматирование (в FAT32 или NTFS). Система предоставит ему "
+"соответствующую букву диска."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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."
-msgstr "Если на компьютере установлена Vista или 7, у вас будет еще один возможный вариант: вы можете расширить существующий раздел с помощью пункта, расположенного слева от пункта свободного места на диске. Кроме того, можно воспользоваться другими программами управления разделами, например gparted, доступным как для Windows, так и для Linux. Как и всегда, при внесении изменений в разделы следует быть очень осторожным и создавать резервные копии всех важных данных."
+"windows and linux. As always, when changing partitions, be very careful, and "
+"make sure all important things have been backed up."
+msgstr ""
+"Если на компьютере установлена Vista или 7, у вас будет еще один возможный "
+"вариант: вы можете расширить существующий раздел с помощью пункта, "
+"расположенного слева от пункта свободного места на диске. Кроме того, можно "
+"воспользоваться другими программами управления разделами, например gparted, "
+"доступным как для Windows, так и для Linux. Как и всегда, при внесении "
+"изменений в разделы следует быть очень осторожным и создавать резервные "
+"копии всех важных данных."
 
 #. type: Content of: <section><info><title>
 #: en/unused.xml:9
@@ -4018,29 +5179,356 @@ 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>"
-msgstr "<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 ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. 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."
-msgstr "На этом этапе программа установки ищет неиспользуемые пакеты локалей и неиспользуемые пакеты аппаратного обеспечения. Затем она предлагает вам удалить их. Это хорошая идея, чтобы согласиться, за исключением того, если вы готовите установку, которая должна работать на другом оборудовании."
+"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>"
-msgstr "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
 msgid ""
-"The next step is the copying of files on hard disk. This takes some minutes."
-" At the end, you get a blank screen for some time, it's normal."
-msgstr "Следующим шагом является копирование файлов на жёсткий диск. Это занимает несколько минут. В завершение вы получите пустой экран в течение некоторого времени, это нормально."
+"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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Впрочем, после установки домашние каталоги пользователей, учетные записи "
+#~ "которых будут добавлены через <emphasis> Центр управления Mageia - "
+#~ "Система - Управление пользователями </emphasis>, будут защищены как от "
+#~ "чтения, так и от записи."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Если вы хотите защитить ваш домашний каталог от чтения для конкретного "
+#~ "пользователя, то вам стоит на этапе установки создать временного "
+#~ "пользователя, а настоящего создать уже после завершения установки и "
+#~ "перезагрузки системы."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD двойственной архитектуры"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Пакеты обеих архитектур присутствуют на одном носителе данных, выбор "
+#~ "архитектуры будет сделан автоматически на основе данных об обнаруженном "
+#~ "процессоре."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Только рабочий стол XFCE."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Только некоторые языки (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, "
+#~ "sv, uk) БЫЛИ ПРОВЕРЕНЫ!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Он содержит несвободное программное обеспечение."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Только 32 бит."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "С системой Bios"
+
+#~ 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."
+#~ msgstr ""
+#~ "Чтобы добавить запись или внести изменения в выбранную запись, нажмите "
+#~ "соответствующую кнопку на странице <emphasis>Настройки загрузчика</"
+#~ "emphasis>. В ответ будет показано окно редактирования."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Если вами был выбран загрузчик <code>Grub 2</code>, тогда вы не сможете "
+#~ "воспользоваться этим инструментом для редактирования записей на следующем "
+#~ "шаге, после нажатия кнопки «Далее». Вам следует воспользоваться другим "
+#~ "графическим инструментом для редактирования, в частности <code>kcm-grub2</"
+#~ "code>, <code>grub-customizer</code>, или внести изменения в <code>/boot/"
+#~ "grub2/custom.cfg</code > вручную."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Некоторые из действий можно выполнять ничем не рискуя. К таким действиям "
+#~ "относится изменение метки записи или обозначение дефолтной записи в "
+#~ "списке."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Вы можете добавить к записи надлежащий номер версии или полностью "
+#~ "изменить название записи."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Дефолтный пункт - это пункт операционной системы, которая загружается, "
+#~ "если пользователем не будет сделано другого выбора во время показа меню "
+#~ "загрузки."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Изменение других параметров может привести к невозможности загрузки "
+#~ "системы. Пожалуйста, не экспериментируйте с этими параметрами, если вам "
+#~ "достоверно неизвестно их назначение."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "В этом случае вы используете Grub2-efi, и вы не можете использовать этот "
+#~ "инструмент для редактирования записей на этом шаге. Для этого необходимо "
+#~ "вручную отредактировать <code>/boot/grub2/custom.cfg</code> или "
+#~ "используйте <code>grub-customizer</code> вместо этого. Всё, что вы можете "
+#~ "сделать здесь, это выбрать запись по умолчанию в раскрывающемся списке."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "После щелчка по кнопке <guibutton>Далее</guibutton>, другой выпадающий "
+#~ "список позволяет выбрать разрешение видео для Grub2, который представляет "
+#~ "собой графический загрузчик."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Если вам нужны другие параметры работы загрузчика, чем те, которые были "
+#~ "выбраны автоматически программой для установки системы, вы можете "
+#~ "изменить их с помощью этой страницы."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Вероятно, вы уже пользовались какой-то операционной системой на "
+#~ "компьютере. Если это так, вам следует определиться, должен ли быть "
+#~ "добавлен пункт Mageia к меню текущего загрузчика, или Mageia должна "
+#~ "создать собственный загрузчик."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "По умолчанию Mageia записывает новый загрузчик GRUB (устаревшую версию) в "
+#~ "MBR (основную загрузочную запись) первого диска компьютера. Если на диске "
+#~ "уже были установлены операционные системы, Mageia попытается добавить "
+#~ "пункты этих операционных систем в новое меню загрузки Mageia."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "В новой версии Mageia вы сможете воспользоваться загрузчиком GRUB2 в "
+#~ "дополнение к устаревшей версии GRUB и Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Операционные системы Linux, в которых используется загрузчик GRUB2, в "
+#~ "текущей версии не распознаются и не поддерживаются дефолтным загрузчиком "
+#~ "GRUB (устаревшей версии)."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Лучшим решением является использование загрузчика GRUB2. Приказать "
+#~ "системе использовать именно этот загрузчик можно на странице «Резюме» при "
+#~ "установке операционной системы."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Если вы решите воспользоваться уже установленным загрузчиком, не забудьте "
+#~ "остановиться на странице «Резюме» при установке и нажать в разделе "
+#~ "«Загрузчик» кнопку <guibutton>Настроить</guibutton>, с помощью которой вы "
+#~ "сможете изменить место установки загрузчика."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Не выбирайте устройство, например «sda», иначе уже созданная запись MBR "
+#~ "будет перезаписана. Вам следует выбрать корневой раздел, который выбран "
+#~ "на шаге распределения диска на разделы, например «sda7»."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Если быть точным, sda - это устройство, а sda7 - раздел на устройстве."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Перейдите на tty2 нажатием комбинации клавиш Ctrl+Alt+F2 и отдайте "
+#~ "команду <literal>df</literal> чтобы определить расположение вашего "
+#~ "раздела <literal>/</literal> (корневого каталога). Вернуться к окну "
+#~ "инсталлятора можно с помощью нажатия комбинации клавиш Ctrl+Alt+F7."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Дополнительные параметры загрузчика"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Если объем на диске с разделом <literal>/</literal>, содержащий каталог "
+#~ "<literal>/tmp</literal>, является очень ограниченным, нажмите кнопку "
+#~ "<guibutton>Дополнительно</guibutton> и отметьте пункт <guilabel>Очищать /"
+#~ "tmp при каждой перезагрузке</guilabel>. Это поможет сэкономить немного "
+#~ "места."
diff --git a/docs/installer/sk.po b/docs/installer/sk.po
index c3fd524d..ce393b24 100644
--- a/docs/installer/sk.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 11:59+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -184,26 +184,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Spravovanie používateľa a superpoužívateľa"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -211,12 +200,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavenie správcovho (rootovho) hesla:"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -237,7 +226,7 @@ msgstr ""
 "prvom políčku."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -246,12 +235,12 @@ msgstr ""
 "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:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Pridať používateľa"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -263,7 +252,7 @@ msgstr ""
 "so svojím počítačom."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -272,7 +261,7 @@ msgstr ""
 "používateľa."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -281,7 +270,7 @@ msgstr ""
 "používateľovo meno."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -293,7 +282,7 @@ msgstr ""
 "citlivé na veľkosť písmen.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -304,7 +293,7 @@ msgstr ""
 "silu heslu. (Pozrite aj <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -315,42 +304,22 @@ msgstr ""
 "textových políčok pre používateľské heslo."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (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:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Každopádne, počas používania vašej novej inštalácie, každý používateľ "
-"ktorého pridáte v <emphasis>MCC - Systém - Spravovať používateľov v systéme</"
-"emphasis> bude mať domáci adresár, ktorý je ochránený rovnako pre čítaním aj "
-"zápisom."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Ak nechcete mať svetom čitateľný domovský adresár pre každého, je odporúčané "
-"pridať teraz len dočasného používateľa a reálneho používateľa (alebo "
-"používateľov) pridať až po reštarte."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Ak uprednostňujete svetom čítané domovské adresáre, možno budete chcieť "
 "pridať všetkých extra žiadúcich používateľov v kroku <emphasis>Konfigurácia "
@@ -358,17 +327,17 @@ msgstr ""
 "používateľov</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Rozšírená správa používateľov"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -378,12 +347,12 @@ msgstr ""
 "pridávate."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -394,7 +363,7 @@ msgstr ""
 "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:140
+#: en/addUser.xml:112
 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, "
@@ -405,7 +374,7 @@ msgstr ""
 "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:147
+#: en/addUser.xml:119
 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 "
@@ -416,7 +385,7 @@ msgstr ""
 "predošlej obrazovke, možnosťami sú Bash, Dash a Sh."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -427,7 +396,7 @@ msgstr ""
 "Ponechajte ho prázdne, pokiaľ neviete, čo robíte."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -806,12 +775,12 @@ msgstr ""
 "\">dodatočných krokoch v Živom režime</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Výber pracovného prostredia"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -820,7 +789,7 @@ msgstr ""
 "k jemnému doladeniu vášho výberu."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -831,16 +800,17 @@ msgstr ""
 "<guilabel>Detaily</guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -860,22 +830,23 @@ msgstr ""
 "predinštalovaného softvéru."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Výber skupín balíkov"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -888,22 +859,22 @@ msgstr ""
 "zájsť s myšou nad názov skupiny."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Pracovná stanica."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafické prostredie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -912,10 +883,11 @@ msgstr ""
 "alebo odobranie balíčkov."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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)."
@@ -1400,23 +1372,24 @@ msgstr ""
 "vašom výbere."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1429,7 +1402,7 @@ msgstr ""
 "literal> partíciu, inak váš systém nebude možné zaviesť."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1440,7 +1413,7 @@ msgstr ""
 "dokonca si prezrieť, čo je v nich, predtým ako začnete."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1449,7 +1422,7 @@ msgstr ""
 "je USB kľúč. Napríklad sda, sdb a sdc, ak sú pripojené tri kusy."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1458,7 +1431,7 @@ msgstr ""
 "partícií na vybranom úložnom zariadení."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1468,44 +1441,78 @@ msgstr ""
 "veľkosť alebo ju prečistite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Pokračujte dokým ste nenastavili všetko podľa vášho priania."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Ak inštalujete Mageiu na UEFI systém, skontrolujte, či ESP (EFI Systémová "
+"Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1516,7 +1523,7 @@ msgstr ""
 "nainštalovať <application>Mageiu</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1525,21 +1532,32 @@ msgstr ""
 "rozložení a obsahu vášho konkrétneho pevného disku."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Použiť existujúce partície"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1548,12 +1566,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Použiť voľné miesto"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1562,12 +1580,12 @@ msgstr ""
 "využije pre vašu novú inštaláciu Mageie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1576,7 +1594,7 @@ msgstr ""
 "môže ponúknuť jeho použitie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1587,7 +1605,7 @@ msgstr ""
 "zazálohované všetky dôležité súbory!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1603,7 +1621,7 @@ 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:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1617,7 +1635,7 @@ msgstr ""
 "nižšie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1625,25 +1643,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Vymazať a použiť Celý Disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1653,12 +1681,12 @@ 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:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Vlastný výber"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1667,19 +1695,19 @@ msgstr ""
 "disku (resp. diskoch)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 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:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1688,31 +1716,31 @@ msgstr ""
 "partícia pre /, nebude tu žiadna samostatná partícia pre /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 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:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "zvyšok (prinajmenšom 12/19) je pridelený pre /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1721,7 +1749,7 @@ msgstr ""
 "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:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1733,8 +1761,48 @@ msgstr ""
 "Možnosť \"Voliteľné\" je jediná, ktorá vám dovoľuje skontrolovať, že toto "
 "bolo správne vykonané"
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1754,17 +1822,17 @@ msgstr ""
 "nastavenia:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Zarovnať na\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Uvádzajúce voľné miesto (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1877,27 +1945,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1907,7 +1972,7 @@ 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:25
+#: 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)."
@@ -1916,7 +1981,7 @@ msgstr ""
 "systémov vo vašom počítači (ak ich máte viac než jeden)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1925,12 +1990,12 @@ msgstr ""
 "vybraná a spustená vaša nainštalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Nech sa vám páči!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2066,6 +2131,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2727,30 +2797,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Súhrn o rozličných parametroch"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2762,18 +2818,40 @@ msgstr ""
 "môžete zhodnotiť tu a zmeniť ich, ak chcete, po stlačení "
 "<guibutton>Konfigurovať</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parametre systému"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Časové pásmo</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2784,12 +2862,12 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Krajina / Región</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2798,33 +2876,33 @@ msgstr ""
 "nastavenie. Pozrite <xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Zavádzač</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 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:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2833,12 +2911,12 @@ msgstr ""
 "<literal>/home</literal> t. j. domáce adresáre."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Služby</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2848,7 +2926,7 @@ msgstr ""
 "umožňuje povoliť alebo zakázať určité úlohy."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2857,22 +2935,22 @@ msgstr ""
 "zabrániť správnemu behu vášho počítača."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Hardvérové parametre"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klávesnica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2880,13 +2958,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Myš</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2895,12 +2980,12 @@ msgstr ""
 "trackbally atď."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Zvuková karta</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2911,43 +2996,45 @@ msgstr ""
 "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:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafické rozhranie</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Nastavenia siete a internetu"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Sieť</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2959,7 +3046,7 @@ msgstr ""
 "Mageia</application>, ak ste ešte nepovolili repozitáre Neslobodných nosičov."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2968,12 +3055,12 @@ msgstr ""
 "sledovanie onoho rozhrania."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxy servery</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2984,7 +3071,7 @@ msgstr ""
 "niektorej proxy služby."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2993,17 +3080,17 @@ msgstr ""
 "parametrov, ktoré sem potrebujete zadať"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Bezpečnosť"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Úroveň bezpečnosti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3012,17 +3099,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:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Firewall</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3032,10 +3119,12 @@ msgstr ""
 "rozširovať alebo ukradnúť."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Vyberte si služby, ktoré si prajete aby mali prístup k vášmu systému. Vaše "
 "výbery budú záležať na tom, k čomu používate váš počítač."
@@ -3048,32 +3137,54 @@ msgstr ""
 "riskantné."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Reštart"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Keď bol zavádzač nainštalovaný, budete vyzvaní pozastaviť váš počítača, "
+"odstrániť živé CD a reštartovať počítač. Keď reštartujete, uvidíte "
+"následnosť ukazovateľov priebehu sťahovania. Tieto naznačujú, že softvérové "
+"médiá sú sťahované (viď Správu softvéru)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Keď bol zavádzač nainštalovaný, budete vyzvaní pozastaviť váš počítača, "
 "odstrániť živé CD a reštartovať počítač. Keď reštartujete, uvidíte "
 "následnosť ukazovateľov priebehu sťahovania. Tieto naznačujú, že softvérové "
 "médiá sú sťahované (viď Správu softvéru)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3134,17 +3245,17 @@ msgstr ""
 "časti <guilabel>Bezpečnosť</guilabel> Ovládacieho Centra Mageie."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Vyberte a používajte ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Úvod"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3153,12 +3264,12 @@ msgstr ""
 "ktorý obraz vyhovuje vašim potrebám."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Sú tu dve rodiny nosičov:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3171,7 +3282,7 @@ msgstr ""
 "možnosti výberu, ktoré Prostredie Pracovnej Plochy si nainštalujete."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3182,22 +3293,22 @@ msgstr ""
 "jednoduchší, ale dostanete menej možností výberu."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Dátové nosiče"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definícia"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3208,7 +3319,7 @@ msgstr ""
 "ktorú je ISO súbor skopírovaný."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3217,40 +3328,40 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klasické inštalačné nosiče"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Bežné vlastnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 "Dokážu spraviť čistú inštaláciu alebo aktualizovať z predošlých vydaní."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Rozličné nosiče pre 32 alebo 64 bitovú architektúru"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3259,57 +3370,24 @@ msgstr ""
 "Pamäťový test, Nástroj na detekciu hardvéru."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 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><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Obe architektúry sú prítomné na tom istom nosiči, voľba je učinená "
-"automaticky vzhľadom k nájdenému procesoru."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Používa len Xfce pracovnú plochu."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Nie všetky jazyky sú dostupné. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, "
-"ru, sv, uk) TREBA SKONTROLOVAŤ!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Obsahuje neslobodný softvér."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Živé nosiče"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3318,19 +3396,21 @@ msgstr ""
 "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:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, 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:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3341,63 +3421,57 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Obsahujú neslobodný softvér."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Živé CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Živé DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, 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:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "iba anglický jazyk."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "iba 32 bitové."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Všetky jazyky sú prítomné."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Živé CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Živé DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "ibe GNOME prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Živé DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Všetky jazyky sú prítomné."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Živé DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "iba KDE prostredie pracovnej plochy."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Iba bootovacie CD nosiče"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3411,7 +3485,7 @@ msgstr ""
 "na lokálnej sieti alebo na internete."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3421,13 +3495,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "iba anglický jazyk."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Spustiť inštaláciu"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3436,12 +3516,13 @@ msgstr ""
 "neslobodný softvér."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3450,17 +3531,17 @@ msgstr ""
 "potrebujú."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Sťahovanie a skontrolovanie nosiča"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Sťahovanie"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3473,12 +3554,12 @@ msgstr ""
 "nízka. Ak je vybrané http, môžete uvidieť i čosi takéto"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3489,22 +3570,22 @@ msgstr ""
 "link>. Potom sa objaví toto okno:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Zaškrtnite prepínacie tlačidlo Uložiť Súbor."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Kontrolovanie neporušenosti stiahnutého nosiča"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3520,12 +3601,12 @@ msgstr ""
 "znova."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3534,7 +3615,7 @@ msgstr ""
 "obrazovemu/suboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3543,7 +3624,7 @@ msgstr ""
 "ku/obrazovemu/suboru.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3552,17 +3633,17 @@ msgstr ""
 "počkať) s číslom daným Mageiou. Napríklad:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Vypálenie alebo vpísanie ISO súboru"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3572,12 +3653,12 @@ msgstr ""
 "zavediteľného nosiča."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3591,12 +3672,12 @@ msgstr ""
 "Writing_CD_and_DVD_images\">Mageia wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3605,7 +3686,7 @@ 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3616,7 +3697,7 @@ msgstr ""
 "bude zmenšená na veľkosť obrazu."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3625,12 +3706,12 @@ msgstr ""
 "naformátovať ho."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3639,17 +3720,17 @@ msgstr ""
 "org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Môžete vyskúšať:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3658,7 +3739,7 @@ msgstr ""
 "použijúc možnosť \"ISO obraz\";"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3667,12 +3748,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3681,17 +3762,17 @@ msgstr ""
 "diskovú partíciu, zadáte nesprávne ID zariadenia."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Otvorte konzolu"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3700,12 +3781,12 @@ msgstr ""
 "na koncovú pomlčku '-')"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3715,17 +3796,17 @@ msgstr ""
 "z neho čítať)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3736,7 +3817,7 @@ msgstr ""
 "<emphasis>sdd</emphasis> v tomto prípade:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3778,7 +3859,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3787,7 +3868,7 @@ msgstr ""
 "<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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3796,12 +3877,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "kde X=názov vášho zariadenia, napr. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3810,37 +3891,37 @@ msgstr ""
 "iso of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Odpojte váš USB kľúč, je to hotovo."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Vyberte si vašu Krajinu / Región"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3849,7 +3930,7 @@ msgstr ""
 "krajiny môže viesť ku neschopnosti používania bezdrôtovej siete."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3858,7 +3939,7 @@ msgstr ""
 "krajiny</guilabel> a tam si vyberte vašu krajinu / región."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3870,21 +3951,20 @@ 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:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Vstupná metóda"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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ť "
 "vstupnú metódu (na spodku zoznamu). Vstupné metódy dovoľujú používateľom "
@@ -3897,10 +3977,11 @@ msgstr ""
 "FTP nosič pred výberom balíkov."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Ak ste počas inštalácie vynechali nastavenie vstupnej metódy, môžete ju "
@@ -4237,356 +4318,391 @@ msgstr ""
 "šesť alebo viac tlačidiel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Pre viacej informácií o možnostiach kernelu na obstarožných a UEFI "
+"systémoch, pozrite: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "So systémom BIOS"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Môžete pridať položku alebo upraviť tú, ktorú ste si najprv vybrali, "
-"stlačením príslušného tlačidla na obrazovke <emphasis>Konfigurácie "
-"zavádzača</emphasis> a upravovaním obrazovky, ktorá sa objaví nad ňou."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "So systémom UEFI"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Ak ste si vybrali <code>Grub 2</code> ako váš zavádzač, môžete v tomto kroku "
-"použiť tento nástroj na úpravu položiek, stlačte 'Ďalej'. Potrebujete ručne "
-"upraviť súbor <code>/boot/grub2/custom.cfg</code> alebo miesto toho použiť "
-"<code>grub-customizer</code>."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+"Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "So systémom UEFI"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Niektoré veci, ktoré môžu byť vykonané bez akéhokoľvek rizika, sú zmena "
-"nadpisu položky a zaškrtnutie políčka, aby sa položka stala predvolenou."
+"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><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
-msgstr "Môžete pridať správne číslo verzie položky, alebo ju celú premenovať."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Predvolená položka je tá, ktorú systém spustí, ak nespravíte inú voľbu počas "
-"štartovania systému."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Úprava iných vecí vás môže ponechať s nespustiteľným systémom. Neskúšajte "
-"prosím nič bez poznania toho, čo robíte."
+"Ak je Mageia prvým systémom nainštalovaným na váš počítač, inštalátor "
+"vytvoril ESP (EFI Systémovú Partíciu) pre zapísanie zavádzača (Grub2-efi). "
+"Ak na vašom počítači boli už predtým nainštalované UEFI operačné systémy "
+"(napríklad Windows 8), Mageia inštalátor zistil jestvujúcu ESP vytvorenú "
+"Windowsami a pridal grub2-efi. Hoci je možné mať viacero ESP partícií, "
+"odporúča sa a stačí len jedna, bez ohľadu na počet operačných systémov, "
+"ktoré máte v počítači."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "So systémom UEFI"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Použitie zavádzača Mageie"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"V tomto prípade používate Grub2-efi a nemôžete použiť tento nástroj na "
-"úpravu položiek v tomto kroku. Pre vykonanie toho potrebujete ručne upraviť "
-"<code>/boot/grub2/custom.cfg</code> alebo namiesto toho použiť <code>grub-"
-"customizer</code>. Jediné čo tu môžete urobiť je zvoliť predvolenú položku "
-"vo vysúvacom zozname."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"Po kliknutí na tlačidlo <guibutton>Ďalej</guibutton> vám ďalší vysúvací "
-"zoznam dovolí vybrať si rozlíšenie obrazovky pre Grub2, ktorý je grafický "
-"zavádzač systémov."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Hlavné parametre zavádzača"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Použitie už existujúceho zavádzača"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+"Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču "
+"presahuje oblasť tejto nápovedy, avšak vo väčšine prípadov bude zahŕňať "
+"spustenie príslušného programu na inštaláciu zavádzača, ktorý by ho mal "
+"detekovať a pridať automaticky. Pozrite si dokumentáciu pre otázny operačný "
+"systém."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Ak uprednostňujete odlišné nastavenia zavádzača namiesto tých automaticky "
-"vybraných inštalátorom, môžete ich zmeniť tu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Pokiaľ už máte iný operačný systém na vašom počítači, v tom prípade sa "
-"potrebujete rozhodnúť, či pridáte Mageiu k vášmu už existujúcemu zavádzaču, "
-"alebo dovolíte Mageii vytvoriť nový zavádzač."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Grafické ponuky Mageie sú pekné:"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Použitie zavádzača Mageie"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Predvolene Mageia zapisuje nový zavádzač (obstarožného) GRUBa do MBR "
-"(Hlavného Spúšťacieho Záznamu) vášho prvého pevného disku. Ak už máte "
-"nainštalované iné operačné systémy, Mageia sa pokúsi pridať ich do vašej "
-"novej štartovacej ponuky Mageie."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Mageia teraz tiež ponúka GRUB2 ako voliteľný zavádzač na dôvažok ku "
-"obstarožnému GRUBu a Lilu."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
-"Linuxové systémy, ktoré používajú zavádzač GRUB2, nie sú momentálne "
-"podporované (zastaralým) GRUBom a nebudú rozpoznané, ak je použitý "
-"predvolený zavádzač GRUB."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Tu je najlepším riešením používať zavádzač GRUB2, ktorý je dostupný na "
-"súhrnnej stránke počas inštalácie."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Použitie už existujúceho zavádzača"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Ak sa rozhodnete použiť už existujúci zavádzač, potom sa potrebujete "
-"POZASTAVIŤ na sumárnej stránke počas inštalácie a kliknúť na tlačidlo "
-"<guibutton>Konfigurovania</guibutton> zavádzača, ktoré vám dovolí zmeniť "
-"inštalačné umiestnenie zavádzača."
+"<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><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, 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:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Nevyberajte si zariadenie ako je napr. \"sda\", inak prepíšete váš "
-"existujúci MBR. Musíte si vybrať koreňovú partíciu, ktorú ste si vybrali "
-"skoršie počas fázy delenia disku, ako je napr. sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Pre ujasnenie, sda je zariadenie, sda7 je partícia alebo iným slovom "
-"povedané oddiel na onom zariadení."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Choďte do tty2 stlačením Ctrl+Alt+F2 a napíšte <literal>df</literal> pre "
-"skontrolovanie, kde je umiestnená vaša <literal>/</literal> (koreňová) "
-"partícia. Ctrl+Alt+F7 vás dostane naspäť na obrazovku inštalátora."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"Presná procedúra pre pridanie vášho systému Mageia ku existujúcemu zavádzaču "
-"presahuje oblasť tejto nápovedy, avšak vo väčšine prípadov bude zahŕňať "
-"spustenie príslušného programu na inštaláciu zavádzača, ktorý by ho mal "
-"detekovať a pridať automaticky. Pozrite si dokumentáciu pre otázny operačný "
-"systém."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Pokročilé parametre zavádzača"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Ak máte veľmi obmedzený diskový priestor pre <literal>/</literal> partíciu, "
-"ktorá obsahuje <literal>/tmp</literal> adresár, kliknite na tlačidlo "
-"<guibutton>Pokročilé</guibutton> a skontrolujte políčko <guilabel>Vyčistiť /"
-"tmp pred každým zavedením systému</guilabel>. Toto pomôže podržať trochu "
-"voľného miesta."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Ak je Mageia prvým systémom nainštalovaným na váš počítač, inštalátor "
-"vytvoril ESP (EFI Systémovú Partíciu) pre zapísanie zavádzača (Grub2-efi). "
-"Ak na vašom počítači boli už predtým nainštalované UEFI operačné systémy "
-"(napríklad Windows 8), Mageia inštalátor zistil jestvujúcu ESP vytvorenú "
-"Windowsami a pridal grub2-efi. Hoci je možné mať viacero ESP partícií, "
-"odporúča sa a stačí len jedna, bez ohľadu na počet operačných systémov, "
-"ktoré máte v počítači."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4638,22 +4754,23 @@ msgstr ""
 "zariadenia) korektne."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Konfigurácia zvuku"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4664,7 +4781,7 @@ msgstr ""
 "predvolený."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4679,7 +4796,7 @@ msgstr ""
 "<guilabel>Konfigurácia zvuku</guilabel> v hornej pravej časti obrazovky."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4691,12 +4808,12 @@ msgstr ""
 "problém."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Rozšírené"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4708,7 +4825,7 @@ msgstr ""
 "nesprávny ovládač."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4879,12 +4996,12 @@ msgid "Uninstalling Mageia"
 msgstr "Odinštalovanie Mageie"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Ako na to"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4895,7 +5012,7 @@ msgstr ""
 "odinštalovania. Toto neplatí u každého operačného systému."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4907,7 +5024,7 @@ msgstr ""
 "systému."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4926,7 +5043,7 @@ msgstr ""
 "<guibutton>Zmazať</guibutton>. Priestor bude uvoľnený."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4935,7 +5052,7 @@ msgstr ""
 "(FAT32 alebo NTFS). Bude jej priradené písmeno partície."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4995,6 +5112,311 @@ msgstr ""
 "minút. Na konci dostanete na určitý čas prázdnu obrazovku, to je normálne."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Každopádne, počas používania vašej novej inštalácie, každý používateľ "
+#~ "ktorého pridáte v <emphasis>MCC - Systém - Spravovať používateľov v "
+#~ "systéme</emphasis> bude mať domáci adresár, ktorý je ochránený rovnako "
+#~ "pre čítaním aj zápisom."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Ak nechcete mať svetom čitateľný domovský adresár pre každého, je "
+#~ "odporúčané pridať teraz len dočasného používateľa a reálneho používateľa "
+#~ "(alebo používateľov) pridať až po reštarte."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Obe architektúry sú prítomné na tom istom nosiči, voľba je učinená "
+#~ "automaticky vzhľadom k nájdenému procesoru."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Používa len Xfce pracovnú plochu."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Nie všetky jazyky sú dostupné. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TREBA SKONTROLOVAŤ!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Obsahuje neslobodný softvér."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Živé CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "iba 32 bitové."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Živé CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "So systémom BIOS"
+
+#~ 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."
+#~ msgstr ""
+#~ "Môžete pridať položku alebo upraviť tú, ktorú ste si najprv vybrali, "
+#~ "stlačením príslušného tlačidla na obrazovke <emphasis>Konfigurácie "
+#~ "zavádzača</emphasis> a upravovaním obrazovky, ktorá sa objaví nad ňou."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Ak ste si vybrali <code>Grub 2</code> ako váš zavádzač, môžete v tomto "
+#~ "kroku použiť tento nástroj na úpravu položiek, stlačte 'Ďalej'. "
+#~ "Potrebujete ručne upraviť súbor <code>/boot/grub2/custom.cfg</code> alebo "
+#~ "miesto toho použiť <code>grub-customizer</code>."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Niektoré veci, ktoré môžu byť vykonané bez akéhokoľvek rizika, sú zmena "
+#~ "nadpisu položky a zaškrtnutie políčka, aby sa položka stala predvolenou."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Môžete pridať správne číslo verzie položky, alebo ju celú premenovať."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Predvolená položka je tá, ktorú systém spustí, ak nespravíte inú voľbu "
+#~ "počas štartovania systému."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Úprava iných vecí vás môže ponechať s nespustiteľným systémom. Neskúšajte "
+#~ "prosím nič bez poznania toho, čo robíte."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "V tomto prípade používate Grub2-efi a nemôžete použiť tento nástroj na "
+#~ "úpravu položiek v tomto kroku. Pre vykonanie toho potrebujete ručne "
+#~ "upraviť <code>/boot/grub2/custom.cfg</code> alebo namiesto toho použiť "
+#~ "<code>grub-customizer</code>. Jediné čo tu môžete urobiť je zvoliť "
+#~ "predvolenú položku vo vysúvacom zozname."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "Po kliknutí na tlačidlo <guibutton>Ďalej</guibutton> vám ďalší vysúvací "
+#~ "zoznam dovolí vybrať si rozlíšenie obrazovky pre Grub2, ktorý je grafický "
+#~ "zavádzač systémov."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Ak uprednostňujete odlišné nastavenia zavádzača namiesto tých automaticky "
+#~ "vybraných inštalátorom, môžete ich zmeniť tu."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Pokiaľ už máte iný operačný systém na vašom počítači, v tom prípade sa "
+#~ "potrebujete rozhodnúť, či pridáte Mageiu k vášmu už existujúcemu "
+#~ "zavádzaču, alebo dovolíte Mageii vytvoriť nový zavádzač."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Predvolene Mageia zapisuje nový zavádzač (obstarožného) GRUBa do MBR "
+#~ "(Hlavného Spúšťacieho Záznamu) vášho prvého pevného disku. Ak už máte "
+#~ "nainštalované iné operačné systémy, Mageia sa pokúsi pridať ich do vašej "
+#~ "novej štartovacej ponuky Mageie."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia teraz tiež ponúka GRUB2 ako voliteľný zavádzač na dôvažok ku "
+#~ "obstarožnému GRUBu a Lilu."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linuxové systémy, ktoré používajú zavádzač GRUB2, nie sú momentálne "
+#~ "podporované (zastaralým) GRUBom a nebudú rozpoznané, ak je použitý "
+#~ "predvolený zavádzač GRUB."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Tu je najlepším riešením používať zavádzač GRUB2, ktorý je dostupný na "
+#~ "súhrnnej stránke počas inštalácie."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Ak sa rozhodnete použiť už existujúci zavádzač, potom sa potrebujete "
+#~ "POZASTAVIŤ na sumárnej stránke počas inštalácie a kliknúť na tlačidlo "
+#~ "<guibutton>Konfigurovania</guibutton> zavádzača, ktoré vám dovolí zmeniť "
+#~ "inštalačné umiestnenie zavádzača."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Nevyberajte si zariadenie ako je napr. \"sda\", inak prepíšete váš "
+#~ "existujúci MBR. Musíte si vybrať koreňovú partíciu, ktorú ste si vybrali "
+#~ "skoršie počas fázy delenia disku, ako je napr. sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Pre ujasnenie, sda je zariadenie, sda7 je partícia alebo iným slovom "
+#~ "povedané oddiel na onom zariadení."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Choďte do tty2 stlačením Ctrl+Alt+F2 a napíšte <literal>df</literal> pre "
+#~ "skontrolovanie, kde je umiestnená vaša <literal>/</literal> (koreňová) "
+#~ "partícia. Ctrl+Alt+F7 vás dostane naspäť na obrazovku inštalátora."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Pokročilé parametre zavádzača"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Ak máte veľmi obmedzený diskový priestor pre <literal>/</literal> "
+#~ "partíciu, ktorá obsahuje <literal>/tmp</literal> adresár, kliknite na "
+#~ "tlačidlo <guibutton>Pokročilé</guibutton> a skontrolujte políčko "
+#~ "<guilabel>Vyčistiť /tmp pred každým zavedením systému</guilabel>. Toto "
+#~ "pomôže podržať trochu voľného miesta."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -5011,10 +5433,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
 #~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 #~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index ca1c7057..30c6fc13 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -10,12 +10,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-08-23 12:10+0000\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
 "i18n@mageia.org>, Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
 "Language: sl\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -167,26 +168,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Upravljanje z naprednimi in navadnimi uporabniki"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -194,12 +184,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Nastavite geslo skrbnika (uporabnika root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -212,19 +202,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Dodajte uporabnika"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -232,21 +222,21 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -254,7 +244,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -262,7 +252,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -270,59 +260,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
-msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:80
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all 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:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Napredno upravljanje z uporabniki"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -330,7 +305,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -338,7 +313,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -346,7 +321,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -354,7 +329,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -665,19 +640,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Izbira namizja"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "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:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -685,16 +660,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -706,22 +682,23 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Izbira skupin paketov"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -730,32 +707,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Delovna postaja."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Strežnik."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafično okolje."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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>
@@ -1150,23 +1127,24 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1175,7 +1153,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1183,62 +1161,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1246,59 +1254,70 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Uporabi obstoječe razdelke"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Uporabi razpoložljivi prostor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 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:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 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:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1306,7 +1325,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1317,7 +1336,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1326,7 +1345,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1334,23 +1353,33 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Zbriši in uporabi celoten disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ta možnost bo uporabila celoten pogon za Magejo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1358,12 +1387,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Po meri"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1371,19 +1400,19 @@ msgstr ""
 "S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Velikost razdelkov:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "Namestitev bo razdelila razpoložljiv prostor po naslednjih pravilih:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1393,7 +1422,7 @@ msgstr ""
 "home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1401,23 +1430,23 @@ msgstr ""
 "trije razdelki"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "ostalih (vsaj 12/19) bo uporabljenih za domači razdelek: /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1427,7 +1456,7 @@ msgstr ""
 "preostalo za domačo mapo: /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1435,8 +1464,48 @@ msgid ""
 "been correctly done"
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1448,17 +1517,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "»Poravnaj z ang.: Align to« »MiB«"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1563,27 +1632,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Čestitke"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1591,26 +1657,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Uživajte"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1723,6 +1789,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2260,30 +2331,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Povzetek raznih nastavitev"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2291,18 +2348,40 @@ msgid ""
 "<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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Sistemske nastavitve"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Časovni pas</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2310,110 +2389,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Država</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, 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:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Zagonski nalagalnik</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Upravljanje z uporabniki</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 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:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Storitve</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 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:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Strojne nastavitve"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tipkovnica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr ""
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Miška</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Zvočna kartica</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2421,42 +2506,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafični vmesnik</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Nastavitve omrežja in interneta"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Omrežje</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2465,19 +2552,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Posredniški strežniki</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2485,51 +2572,52 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Varnost"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Stopnja varnosti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Požarni zid</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2538,27 +2626,43 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Ponovni zagon"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
@@ -2614,29 +2718,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Izbor in uporaba odtisa diska: ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Predstavitev"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2645,7 +2749,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2653,22 +2757,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Vir"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definicija"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2676,7 +2780,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -2685,109 +2789,81 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Mediji za klasično namestitev"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Skupne značilnosti"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD z dvojno arhitekturo"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Uporablja samo namizje Xfce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Vsebuje lastniško programsko opremo."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -2795,63 +2871,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "Vsebuje lastniško programsko opremo."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "samo angleščina."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr ""
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Prisotni so vsi jeziki."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Prisotni so vsi jeziki."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr ""
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Uporablja samo namizje Xfce."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -2860,49 +2927,56 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "samo angleščina."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Zagon namestitve"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Prejemanje"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -2911,12 +2985,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -2924,22 +2998,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -2949,55 +3023,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3006,19 +3080,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3029,19 +3103,19 @@ msgstr ""
 "Izgubili boste vse podatke na njem."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3051,17 +3125,17 @@ msgstr ""
 "link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Lahko poskusite:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3070,7 +3144,7 @@ msgstr ""
 "možnosti \"ISO image\" \"ISO slika\" ;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3079,58 +3153,58 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Odprite konzolo"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root 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:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3138,7 +3212,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3180,76 +3254,75 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Izbor države/regije"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3258,28 +3331,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Način vnosa"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3544,286 +3615,352 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Glavne možnosti zagonskega nalagalnika"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Glavne možnosti zagonskega nalagalnika"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
-"imageobject>"
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Glavne možnosti zagonskega nalagalnika"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr ""
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Storitve</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Napredne možnosti zagonskega nalagalnika"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -3869,22 +4006,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Nastavitve zvoka"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -3892,7 +4030,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -3902,7 +4040,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -3910,12 +4048,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Napredno"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -3923,7 +4061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4076,12 +4214,12 @@ msgid "Uninstalling Mageia"
 msgstr "Odstrani Magejo"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4089,7 +4227,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4097,7 +4235,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4109,14 +4247,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4163,3 +4301,96 @@ 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 ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD z dvojno arhitekturo"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Vsebuje lastniško programsko opremo."
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Napredne možnosti zagonskega nalagalnika"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index 2d5ed48e..dfd8e1f7 100644
--- a/docs/installer/sq.po
+++ b/docs/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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\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/"
@@ -184,26 +184,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Menaxher për Përdorues dhe Super-përdoruesin "
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -211,12 +200,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "Vendos Fjalëkalim administratori (root):"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -238,7 +227,7 @@ msgstr ""
 "shtypur keq pyetjen fjalëkalimin e parë duke i krahasuar ato."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -248,12 +237,12 @@ msgstr ""
 "në një fjalëkalim."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Fut një përdorues"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -265,7 +254,7 @@ msgstr ""
 "përdoruesi mesatar bën me kompjuterin e tij"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -274,7 +263,7 @@ msgstr ""
 "ikonën e përdoruesve."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -283,7 +272,7 @@ msgstr ""
 "këtë kuti teksti."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -294,7 +283,7 @@ msgstr ""
 "<emphasis>Emri hyrës është rast i ndjeshme.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -306,7 +295,7 @@ msgstr ""
 "\"jepFjalëkalim\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -317,41 +306,22 @@ msgstr ""
 "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:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (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:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Megjithatë, duke përdorur instalmin tuaj të ri, çdo përdorues që të shtoni "
-"në <emphasis>MCC - System - Menaxho përdoruesit në sistem</emphasis> do të "
-"ketë një skedarë shtëpi që është me mbrojtje lexo dhe shkruaj."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Nëse ju nuk doni një skedarë të përgjithshëm të lexueshëm shtëpi për të "
-"gjithë, është këshilluar për të shtuar vetëm një përdorues të përkohshme "
-"tani dhe për të shtuar një të vërtetë pa(s) rinisjes."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
-msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Nëse ju preferoni skedarë të lexueshëm dokumente në shtëpi, ju mund të "
 "dëshironi të shtoni të gjithë përdoruesit shtesë të nevojshme në "
@@ -359,17 +329,17 @@ msgstr ""
 "Zgjidh <emphasis>Menaxhimi Përdoruesit</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Menaxhim Përdoruesi Avancuar"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -379,12 +349,12 @@ msgstr ""
 "shtuar."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -395,7 +365,7 @@ msgstr ""
 "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:140
+#: en/addUser.xml:112
 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, "
@@ -407,7 +377,7 @@ msgstr ""
 "përdoruesit normal."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -418,7 +388,7 @@ msgstr ""
 "Bash, Dash dhe Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -429,7 +399,7 @@ msgstr ""
 "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:159
+#: en/addUser.xml:131
 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 "
@@ -778,12 +748,12 @@ msgstr ""
 "\"testing\"> hapa shtesë në mënyrë live</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Përzgjedhje Desktop"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -792,7 +762,7 @@ msgstr ""
 "për të akorduar gjobë zgjedhjes tuaj."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -803,16 +773,17 @@ msgstr ""
 "<guilabel>Detajet</guilabel>"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -832,22 +803,23 @@ msgstr ""
 "dhe më pak paketa instaluese nga parazgjedhja."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Zgjidhni Grupet Paketave"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -861,22 +833,22 @@ msgstr ""
 "ta."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Stacion-pune."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Mjedis Grafike."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -885,10 +857,11 @@ msgstr ""
 "manualisht ose hequr paketa."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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)."
@@ -1377,23 +1350,24 @@ msgstr ""
 "konservatore në zgjedhjen tuaj."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1406,7 +1380,7 @@ msgstr ""
 "literal> NUK duhet të vendoset, përndryshe sistemi juaj nuk do to ndizet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1414,14 +1388,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1430,7 +1404,7 @@ msgstr ""
 "particionet në pajisjen e zgjedhura ruajtëse"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1440,41 +1414,71 @@ msgstr ""
 "montimi, ndrysho atë apo fshij atë."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Vazhdoni derisa ju të keni rregulluar gjithçka për dëshirat tuaja."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1482,7 +1486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1491,21 +1495,32 @@ msgstr ""
 "veçantë hard disku(t) paraqitjen dhe përmbajtjen."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Përdor ndarjet ekzistuese"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1514,12 +1529,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Përdor Hapësirën e Lirë"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1528,12 +1543,12 @@ msgstr ""
 "të përdorë atë për instalimin tuaj të ri Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1542,7 +1557,7 @@ msgstr ""
 "instaluesi mund të ofrojë ta përdorni atë."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1553,7 +1568,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:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1570,7 +1585,7 @@ msgstr ""
 "e rekomanduar për të ruajtur dosjet tuaja personale rezervë."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1579,7 +1594,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1587,25 +1602,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 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:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1616,12 +1641,12 @@ msgstr ""
 "atëherë mos e përdorni këtë opsion."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Personalizuar"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1630,12 +1655,12 @@ msgstr ""
 "tuaja."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1644,7 +1669,7 @@ msgstr ""
 "mëposhtme:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1653,7 +1678,7 @@ msgstr ""
 "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:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1661,7 +1686,7 @@ msgstr ""
 "krijuar"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1669,17 +1694,17 @@ msgstr ""
 "prej 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "pjesa tjetër (të paktën 12/19) është e ndarë për /shtëpi"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1689,7 +1714,7 @@ msgstr ""
 "shtëpi."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1701,8 +1726,48 @@ msgstr ""
 "montuar në /boot/EFI. Në opsion \"Modifiko\" është i vetmi që lejon për të "
 "kontrolluar se është bërë në mënyrë korrekte"
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1714,17 +1779,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Radhit në\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Liro hapësirën mësipër (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1834,27 +1899,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Urime"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1865,7 +1927,7 @@ msgstr ""
 "të rifilloni kompjuterin tuaj."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1874,7 +1936,7 @@ msgstr ""
 "sistemeve operative në kompjuterin tuaj (nëse keni më shumë se një)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1883,12 +1945,12 @@ msgstr ""
 "juaj Mageia do të përzgjidhet automatikisht dhe filloi."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Kënaquni!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2024,6 +2086,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2617,30 +2684,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2648,18 +2701,40 @@ msgid ""
 "<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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Parametrat e Sistemit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Kohëzone</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2667,66 +2742,66 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Shteti / Rajoni</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, 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:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Ngarkues-ndezës</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Menaxhim përdoruesi</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 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:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Shërbimet</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2735,22 +2810,22 @@ msgstr ""
 "gabim mund të parandoj kompjuterin tuaj së punuari saktë."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Parametrat pjesëve-elektronike"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tastierë</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2758,25 +2833,32 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Miu</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Karta Zërit</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2784,42 +2866,44 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Ndërfaqe Grafike</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Parametrat rrjeti dhe Interneti"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Rrjeti</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2828,7 +2912,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2837,12 +2921,12 @@ msgstr ""
 "tuaj për të parë atë ndërfaqe gjithashtu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxies</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2850,7 +2934,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2859,44 +2943,45 @@ msgstr ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Siguria"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Niveli Sigurisë</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Muri-Mbrojtës</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2907,26 +2992,44 @@ msgstr ""
 "jetë shumë e rrezikshme."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Rinise (riboot)"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -2979,29 +3082,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Zgjidh dhe përdorë ISOs"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Paraqitje"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3010,7 +3113,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3018,22 +3121,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Përcaktim"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3041,7 +3144,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3050,23 +3153,23 @@ msgstr ""
 "\">këtu</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
@@ -3074,90 +3177,60 @@ msgstr ""
 "lëshimet e mëparshme."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:87
+#: en/SelectAndUseISOs2.xml:89
 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><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr ""
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Jo të gjitha gjuhët janë në dispozicion. (be, bg, ca, de, en, es, fr, it, "
-"mk, pl, pt, ru, sv, uk) TË KONTROLLOHEN!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "përmban programe jo të lirë."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3165,63 +3238,53 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+msgid "Live DVD Plasma"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+msgid "Plasma desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Vetëm gjuha angleze."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "32 bit vetëm."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Të gjitha gjuhët janë të pranishëme."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+msgid "Live DVD Xfce"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Të gjitha gjuhët janë të pranishëme."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+msgid "Xfce desktop environment only."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3230,49 +3293,54 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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."
 msgstr ""
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "Vetëm gjuha angleze."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+msgid "netinstall.iso"
+msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Shkarkim"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3286,12 +3354,12 @@ msgstr ""
 "të shihni diçka si"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3299,22 +3367,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3324,55 +3392,55 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
 msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3381,19 +3449,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3401,72 +3469,72 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Ju mund të provoni:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <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:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Hap panel komandimi"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3475,29 +3543,29 @@ msgstr ""
 "fund )"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3505,7 +3573,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3529,14 +3597,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:460
+#: en/SelectAndUseISOs2.xml:420
 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 ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3545,12 +3613,12 @@ msgstr ""
 "bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3559,37 +3627,37 @@ msgstr ""
 "of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Zgjidhni Shtetin tuaj / Rajonin"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3599,14 +3667,14 @@ msgstr ""
 "Wireless."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3615,28 +3683,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Metodë hyrëse"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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:61
+#: en/selectCountry.xml:44
 msgid ""
 "If you missed the input method setup during installation, you can access it "
-"after you boot your installed system via \"Configure your Computer\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 
@@ -3903,284 +3969,353 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#. type: Content of: <section><note><para>
+#: 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>"
 msgstr ""
 
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Opsionet kryesore të programit Bootloader"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Opsionet kryesore të programit Bootloader"
+
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
-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."
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
 msgstr ""
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+msgstr ""
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
-msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+msgid "Grub2-efi on UEFI systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
-msgstr ""
-
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Opsionet kryesore të programit Bootloader"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+msgstr ""
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr ""
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr ""
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set 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><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, 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:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
 msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<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><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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>
@@ -4226,22 +4361,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Konfigurimi zërit"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4249,7 +4385,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4259,7 +4395,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4267,12 +4403,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avancuar"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4280,7 +4416,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4430,12 +4566,12 @@ msgid "Uninstalling Mageia"
 msgstr "Ç'instalim Mageia "
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Sitë"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4447,7 +4583,7 @@ msgstr ""
 "çdo sistem operativ."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4455,7 +4591,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4467,7 +4603,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4476,7 +4612,7 @@ msgstr ""
 "ta formatoni atë (FAT32 apo NTFS). Ajo do të marrë një letër ndarje."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4521,3 +4657,105 @@ 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 ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Megjithatë, duke përdorur instalmin tuaj të ri, çdo përdorues që të "
+#~ "shtoni në <emphasis>MCC - System - Menaxho përdoruesit në sistem</"
+#~ "emphasis> do të ketë një skedarë shtëpi që është me mbrojtje lexo dhe "
+#~ "shkruaj."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Nëse ju nuk doni një skedarë të përgjithshëm të lexueshëm shtëpi për të "
+#~ "gjithë, është këshilluar për të shtuar vetëm një përdorues të përkohshme "
+#~ "tani dhe për të shtuar një të vërtetë pa(s) rinisjes."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Jo të gjitha gjuhët janë në dispozicion. (be, bg, ca, de, en, es, fr, it, "
+#~ "mk, pl, pt, ru, sv, uk) TË KONTROLLOHEN!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "përmban programe jo të lirë."
+
+#~ msgid "32 bit only."
+#~ msgstr "32 bit vetëm."
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index a86ecd4e..60bf5595 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 12:00+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -185,26 +185,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Hantering av användare och administratör"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -212,12 +201,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -237,7 +226,7 @@ msgstr ""
 "jämföra dem så att du inte har skrivit fel."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -247,12 +236,12 @@ msgstr ""
 "lösenord."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Lägg till en användare"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -264,7 +253,7 @@ msgstr ""
 "med sin dator."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -273,7 +262,7 @@ msgstr ""
 "användarens ikon att ändras."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -282,7 +271,7 @@ msgstr ""
 "här fältet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -294,7 +283,7 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -305,7 +294,7 @@ msgstr ""
 "lösenordets styrka. (Se även <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -316,57 +305,39 @@ msgstr ""
 "båda fälten."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "De användare som du lägger till under installationen av Mageia kommer att ha "
 "en hemkatalog som är läsbar (men skrivskyddad ) av alla."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Däremot kommer de användare som du lägger till i efterhand i  <emphasis>MCC "
-"- System - Hantera användare i systemet</emphasis> att ha en hemkatalog som "
-"är både läs -och skrivskyddad."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Om du inte vill ha en hemkatalog som är läsbar för alla bör du enbart lägga "
-"till en temporär användare nu, och lägga till de verkliga efter omstarten."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Om du föredrar hemkataloger som är läsbara för alla så kan du lägga till "
 "alla extra användare i <emphasis>konfigurationsöversikten</emphasis> i "
 "slutet av installationen. Välj <emphasis>Användarhantering</emphasis>."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Avancerad hantering av användare"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -375,12 +346,12 @@ msgstr ""
 "inställningar för den användare du lägger till."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -391,7 +362,7 @@ msgstr ""
 "spara sina viktiga filer till ett USB-minne"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -402,7 +373,7 @@ msgstr ""
 "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:147
+#: en/addUser.xml:119
 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 "
@@ -413,7 +384,7 @@ msgstr ""
 "eller Sh"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -424,7 +395,7 @@ msgstr ""
 "du gör."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -801,12 +772,12 @@ msgstr ""
 "\"testing\">extra steg för liveläge</link>."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Val av skrivbordsmiljö"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -815,7 +786,7 @@ msgstr ""
 "ditt val."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -826,16 +797,17 @@ msgstr ""
 "guilabel>."
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -854,22 +826,23 @@ msgstr ""
 "med mindre ögongodis och färre programpaket installerade som standard."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Val av paketgrupp"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -881,22 +854,22 @@ msgstr ""
 "för varje paket visas som ett verktygstips när du drar markören över dem."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "Arbetsstation."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Server."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafisk miljö."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -905,10 +878,11 @@ msgstr ""
 "lägga till eller ta bort paket."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "Läs <xref linkend=\"minimal-install\"></xref> för instruktioner om hur du "
 "utför en minimal installation utan X &amp; IceVM."
@@ -1388,23 +1362,24 @@ msgstr ""
 "gång så är det klokt att vara försiktig med dina val."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Anpassad diskpartionering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1417,7 +1392,7 @@ msgstr ""
 "ställas in, annars kommer detta göra ditt system omöjligt att boota."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1428,7 +1403,7 @@ msgstr ""
 "dem innan du startar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1438,7 +1413,7 @@ msgstr ""
 "stycken."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1447,7 +1422,7 @@ msgstr ""
 "den valda lagringsenheten"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1456,43 +1431,77 @@ msgstr ""
 "filsystem och en monteringspunkt, ändra storlek eller radera den."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Fortsätt tills du har justerat allt enligt dina önskemål."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 "Om du installerar Mageia på ett UEFI-system, se till att en ESP (EFI "
 "sytempartition) är tillgänglig och korrekt monterad på /boot/EFI (se ovan)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"Om du installerar Mageia på ett UEFI-system, se till att en ESP (EFI "
+"sytempartition) är tillgänglig och korrekt monterad på /boot/EFI (se ovan)."
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1503,7 +1512,7 @@ msgstr ""
 "application> kan installeras."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1512,21 +1521,32 @@ msgstr ""
 "layouten och innehållet på din(a) hårddisk(ar)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Använd existerande partitioner"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1535,12 +1555,12 @@ msgstr ""
 "hittats och kan användas för installation."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Använd ledigt utrymme"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1549,12 +1569,12 @@ msgstr ""
 "använda det för att installera Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1563,7 +1583,7 @@ msgstr ""
 "dig möjlighet att använda det."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 +1594,7 @@ msgstr ""
 "har säkerhetskopierat alla viktiga filer!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 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,7 +1610,7 @@ msgstr ""
 "användas. Du rekommenderas starkt att säkerhetskopiera dina personliga filer."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1604,7 +1624,7 @@ msgstr ""
 "nedan."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1612,25 +1632,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 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:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1641,12 +1671,12 @@ msgstr ""
 "ska du inte använda detta alternativ."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Anpassad"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1655,12 +1685,12 @@ msgstr ""
 "a disk/ar."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitionsstorlek:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1669,7 +1699,7 @@ msgstr ""
 "följande regler:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1678,31 +1708,31 @@ msgstr ""
 "att skapas för /. Det finns ingen separat partition för /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 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:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / 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:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "resten (minst 12/19) förledas till /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1712,7 +1742,7 @@ msgstr ""
 "och resten till /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1724,8 +1754,48 @@ msgstr ""
 "anpassade alternativet är det enda sättet att kontrollera så att det har "
 "utförts korrekt"
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1744,17 +1814,17 @@ msgstr ""
 "följande inställningar:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Rikta mot\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Ledigt utrymme före (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1866,27 +1936,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Grattis"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1897,7 +1964,7 @@ msgstr ""
 "din dator."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1906,7 +1973,7 @@ msgstr ""
 "har mer än ett) i starthanteraren."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1915,12 +1982,12 @@ msgstr ""
 "väljas och starta automatiskt."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Njut!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2055,6 +2122,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2713,30 +2785,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Sammanfattning av diverse parametrar"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2748,18 +2806,40 @@ msgstr ""
 "kontrollera inställningarna här och ändra dem om du vill efteråt genom att "
 "trycka på knappen <guibutton>Konfigurera</guibutton>."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Systemparametrar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Tidszon</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2770,12 +2850,12 @@ msgstr ""
 "xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Land / Region</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2784,33 +2864,33 @@ msgstr ""
 "till inställningen. Läs <xref linkend=\"selectCountry\"></xref>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Starthanterare</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr "Ändra inget om du inte vet hur man konfigurerar Grub och/eller Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Användarhantering</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2819,12 +2899,12 @@ msgstr ""
 "<literal>/home</literal>-katalog."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Tjänster</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2833,7 +2913,7 @@ msgstr ""
 "det här verktyget kan du aktivera eller inaktivera vissa uppgifter."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2842,22 +2922,22 @@ msgstr ""
 "dator inte fungerar korrekt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Hårdvaruparametrar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Tangentbord</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2865,13 +2945,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Mus</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2880,12 +2967,12 @@ msgstr ""
 "etc."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Ljudkort</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2896,41 +2983,43 @@ msgstr ""
 "för ditt ljudkort men där ingen av dem är standard."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafiskt gränssnitt</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Nätverk och Internetparametrar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Nätverk</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2943,7 +3032,7 @@ msgstr ""
 "aktiverat Nonfree-medierna."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2952,12 +3041,12 @@ msgstr ""
 "nätverkskort."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Proxyservrar</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2967,7 +3056,7 @@ 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:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2976,17 +3065,17 @@ msgstr ""
 "du behöver ange här"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Säkerhet"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Säkerhetsnivå</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -2995,17 +3084,17 @@ msgstr ""
 "standardinställningen (Standard) tillräcklig för normalt användande."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Brandvägg</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3014,10 +3103,12 @@ 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:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Välj de tjänster som du vill ska få tillgång till ditt system. Det du väljer "
 "beror på vad du använder din dator till."
@@ -3029,32 +3120,54 @@ msgstr ""
 "Tänk på att om du tillåter allt (ingen brandvägg) så tar du en stor risk."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Starta om"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"När starthanteraren har installerats ombeds du att stanna systemet, ta bort "
+"din Live-CD och starta om datorn. När du startat om kommer du att se några "
+"fortlöpande staplar med hämtningsförlopp. Det innebär att mjukvaran laddas "
+"ner (se mjukvaruhantering)."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "När starthanteraren har installerats ombeds du att stanna systemet, ta bort "
 "din Live-CD och starta om datorn. När du startat om kommer du att se några "
 "fortlöpande staplar med hämtningsförlopp. Det innebär att mjukvaran laddas "
 "ner (se mjukvaruhantering)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3116,17 +3229,17 @@ msgstr ""
 "kontrollcentral."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "Välj och använd ISO-filer"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Presentation"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3135,12 +3248,12 @@ msgstr ""
 "att välja den avbild som passar dina behov bäst."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "Det finns två media-familjer:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3154,7 +3267,7 @@ msgstr ""
 "du vill installera."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3165,22 +3278,22 @@ msgstr ""
 "är sedan lättare men du har färre val."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Definition"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3191,7 +3304,7 @@ msgstr ""
 "filen kopieras till."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3200,40 +3313,40 @@ msgstr ""
 "link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klassiska installtionsmedier"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Vanliga funktioner"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr ""
 "De kan utföra en ren installation eller uppgradera från en tidigare version."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Olika media för 32 eller 64-bitars arkitektur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3242,58 +3355,25 @@ msgstr ""
 "minnestest och identifiering av hårdvara."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr ""
 "Du kommer under installationen att få välja att lägga till icke-fri "
 "programvara."
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD för multiarkitektur"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Båda arkitekturerna finns på samma medium, valet görs automatiskt efter "
-"identifierad processor."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Använder endast XFCE-skrivbordsmiljö."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Alla språk är inte tillgängliga. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) SKA KONTROLLERAS!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Den innehåller icke-fri programvara."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3302,18 +3382,20 @@ msgstr ""
 "på en hårddisk, och eventuellt installera den."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Varje ISO innehåller enbart en skrivbordsmiljö (KDE eller GNOME)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3324,63 +3406,57 @@ msgstr ""
 "version.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "De innehåller icke-fri mjukvara."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Endast skrivbordsmiljön KDE."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Endast på engelska."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Endast 32-bitars."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Alla språk finns med."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Endast skrivbordsmiljön GNOME."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Alla språk finns med."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Endast skrivbordsmiljön KDE."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Endast bootbar CD-media"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3393,7 +3469,7 @@ 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:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3403,13 +3479,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Endast på engelska."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Påbörja installationen"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3417,12 +3499,13 @@ msgstr ""
 "Innehåller endast gratis mjukvara, för de som inte vill använda icke-fri."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3431,17 +3514,17 @@ msgstr ""
 "som behöver det."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Laddar ner och kontrollerar media"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "Hämtar"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3454,12 +3537,12 @@ msgstr ""
 "så kan du även se något som "
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3470,22 +3553,22 @@ msgstr ""
 "framtida användning</link>. Sedan ser du det här fönstret:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Markera knappen Spara fil."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "Kontrollerar integritet av hämtat media"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3500,12 +3583,12 @@ msgstr ""
 "bör du ladda ner den igen."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3514,7 +3597,7 @@ msgstr ""
 "till/avbilden/fil.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3523,7 +3606,7 @@ msgstr ""
 "till/avbilden/fil.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3532,17 +3615,17 @@ msgstr ""
 "med det nummer som Mageia har försett. Exempel:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "Bränn eller dumpa ISO-filen."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3552,12 +3635,12 @@ msgstr ""
 "startbart media."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3570,12 +3653,12 @@ msgstr ""
 "org/en/Writing_CD_and_DVD_images\">Mageias wiki</link>."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3584,7 +3667,7 @@ 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:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3595,7 +3678,7 @@ msgstr ""
 "reducerad till avbildens storlek."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3604,12 +3687,12 @@ msgstr ""
 "formatera om USB-enheten."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3618,17 +3701,17 @@ msgstr ""
 "mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Du kan prova:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3637,7 +3720,7 @@ msgstr ""
 "användning av \"ISO image\"-alternativet;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3646,12 +3729,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3660,17 +3743,17 @@ msgstr ""
 "över en hårddiskpartition om du anger fel enhets-ID."
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Öppna en konsol"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3679,12 +3762,12 @@ msgstr ""
 "slutet)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3693,17 +3776,17 @@ msgstr ""
 "filhanterare som kan läsa det)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3714,7 +3797,7 @@ msgstr ""
 "<emphasis>sdd</emphasis>. I det här fallet:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3756,7 +3839,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3765,7 +3848,7 @@ msgstr ""
 "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:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3774,12 +3857,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Där X=din enhets namn t. ex. /dev/sdc"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3788,37 +3871,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "Koppla från ditt USB-minne och sedan är allt klart."
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Välj ditt land / region"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3827,7 +3910,7 @@ msgstr ""
 "land kan leda till att en trådlös nätverksanslutning inte fungerar."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3836,7 +3919,7 @@ msgstr ""
 "länder</guilabel> och välj ditt land / region där."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3849,21 +3932,20 @@ msgstr ""
 "riktiga val så ignorera detta."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Inmatningsmetod"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 fönstret <guilabel>Andra länder</guilabel> kan du också välja en "
 "inmatningsmetod (längst ner i listan). Inmatningsmetoder tillåter användare "
@@ -3877,10 +3959,11 @@ msgstr ""
 "paketvalen."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Om du missade att ställa in inmatningsmetod under installationen så kan du "
@@ -4215,356 +4298,389 @@ msgstr ""
 "knappar."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"För mer information om kernel-alternativ för legacy och UEFI-läge läs: <link "
+"ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://"
+"wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Huvudalternativ för startshanteraren"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Med ett BIOS-system"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Huvudalternativ för startshanteraren"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"Du kan lägga till en post eller redigera förstavalet genom att klicka på "
-"tillhörande knapp på skrärmen för <emphasis>Konfigurering av starthanterare</"
-"emphasis> och ändra i fönstret som dyker upp."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Med ett UEFI-system"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+msgid "The Mageia graphical menus are nice :"
+msgstr "Mageia's grafiska menyer är fina :"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:33
+msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Om du har du valt <code>Grub 2</code> som starthanterare så kan du inte "
-"använda det här verktyget för att ändra poster i det här steget. Klicka på "
-"'Nästa'. Du måste ändra i <code>/boot/grub2/custom.cfg</code> manuellt eller "
-"använda <code>grub-customizer</code>."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr "Ändra inte din \"startenhet\" om du inte verkligen vet vad du gör."
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Med ett UEFI-system"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Några saker som kan ändras utan risk är att ändra etiketten av en post och "
-"markera kryssrutan för att ange den som ska vara standard."
+"På ett UEFI-system är användargränssnittet lite annorlunda eftersom du inte "
+"kan välja starthanterare, det är bara Grub2-efi som är tillgänglig."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Du kan lägga till ett korrekt versionsnummer för en post eller döpa om det "
-"helt."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Standardposten är det som systemet startar om du inte gör ett val när du "
-"startar datorn."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Om du redigerar andra inställningar utan att veta vad du gör kan resultera i "
-"ett system som inte går att starta. Var snäll och ändra inget om du inte vet "
-"vad du gör."
+"Om Mageia är det första installerade operativsystemet på din dator så har "
+"installationsprogrammet redan skapat en ESP (EFI Systempartition) för att ta "
+"emot starthanteraren (Grub2-efi). Om det redan fanns ett UEFI-operativsystem "
+"installerat på din dator (t. ex. Windows 8) så har Mageias "
+"installationsprogram redan hittat den existerande ESP-partitionen som "
+"Windows har skapat, och lagt till grub2-efi. Man kan ha mer än en ESP-"
+"partition men enbart en rekommenderas och är tillräcklig oavsett hur många "
+"operativsystem du har."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Med ett UEFI-system"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Använder en startshanterare från Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"I det här fallet använder du Grub2-efi och du kan inte använda detta verktyg "
-"för att ändra i det här steget. För att göra ändringar måste du manuellt "
-"redigera i <code>/boot/grub2/custom.cfg</code> eller använda grub-"
-"customizer. Det enda du kan göra här är att välja standardposten i "
-"rullgardinsmenyn."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"När du klickat på knappen <guibutton>Nästa</guibutton> kommer du att se en "
-"annan rullgardinsmeny där du kan välja upplösning i Grub2 som är en grafisk "
-"starthanterare."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Huvudalternativ för startshanteraren"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Använder en befintlig startshanterare"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+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 "
+"att köra installationsprogrammet för starthanteraren som bör hitta och lägga "
+"till det automatiskt. Se dokumentationen för operativsystemet i fråga."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Om du föredrar olika inställningar för starthanteraren för de som är "
-"automatiskt valda av installationen så kan du ändra dessa här."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Du har kanske redan ett operativsystem på din dator, i så fall måste du "
-"välja om du vill lägga till Mageia in den existerande starthanteraren, eller "
-"tillåta Mageia att skapa en ny."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Mageia's grafiska menyer är fina :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Använder en startshanterare från Mageia"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Som standard kommer Mageia att skriva en ny GRUB (legacy)-starthanterare på "
-"MBR (Master Boot Record) på din första hårddisk. Om du redan har andra "
-"operativsystem installerade kommer Mageia att försöka lägga till dem i din "
-"nya startmeny."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Mageia erbjuder nu även GRUB2 som en valfri starthanterare tillsammans med "
-"GRUB legacy och Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
-"Linuxsystem som använder GRUB2-starthanterare stöds för närvarande inte av "
-"GRUB (legacy) och kommer inte att kännas igen om standard starthanterare som "
-"används är GRUB."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Den bästa lösningen här är att använda GRUB2 som starthanterare, som är "
-"tillgänglig på översiktssidan under installation."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Använder en befintlig startshanterare"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Om du bestämmer dig för att använda en befintlig starthanterare måste du "
-"komma ihåg att STANNA på översiktssidan under installationen. Klicka på "
-"knappen <guibutton>Konfigurera</guibutton> för starthanterare där du kan "
-"ändra var du vill installera starthanteraren."
+"<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."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Tjänster</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Välj inte en enhet, t. ex. \"sda\" för då kommer du att skriva över din "
-"nuvarande MBR. Du måste välja root-partitionen som du valde under "
-"installationen tidigare, t. ex. sda7."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"För att klargöra, sda är en enhet, sda7 är en partition på den enheten."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Gå till tty2 med Ctrl+Alt+F2 och skriv <literal>df</literal> för att "
-"kontrollera vilken din <literal>/</literal> (root) partition är. Ctrl+Alt+F7 "
-"tar dig tillbaka till installationen."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"att köra installationsprogrammet för starthanteraren som bör hitta och lägga "
-"till det automatiskt. Se dokumentationen för operativsystemet i fråga."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Avancerat alternativ för starthanteraren"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"Om du har begränsat lagringsutrymme för <literal>/</literal>-partitionen som "
-"innehåller <literal>/tmp</literal>, klicka på <guibutton>Avancerat</"
-"guibutton> och kryssa i rutan <guilabel>Rensa /tmp vid varje start</"
-"guilabel>. Det hjälper till att upprätthålla en viss mängd ledigt utrymme."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"På ett UEFI-system är användargränssnittet lite annorlunda eftersom du inte "
-"kan välja starthanterare, det är bara Grub2-efi som är tillgänglig."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Om Mageia är det första installerade operativsystemet på din dator så har "
-"installationsprogrammet redan skapat en ESP (EFI Systempartition) för att ta "
-"emot starthanteraren (Grub2-efi). Om det redan fanns ett UEFI-operativsystem "
-"installerat på din dator (t. ex. Windows 8) så har Mageias "
-"installationsprogram redan hittat den existerande ESP-partitionen som "
-"Windows har skapat, och lagt till grub2-efi. Man kan ha mer än en ESP-"
-"partition men enbart en rekommenderas och är tillräcklig oavsett hur många "
-"operativsystem du har."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "Ändra inte din \"startenhet\" om du inte verkligen vet vad du gör."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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
@@ -4613,22 +4729,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX bör sedan kunna konfigurera disken korrekt."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Ljudkonfiguration"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4638,7 +4755,7 @@ msgstr ""
 "valt för ditt ljudkort som blir standard drivrutin, om vi har en sådan."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4652,7 +4769,7 @@ msgstr ""
 "guilabel> längst upp till höger på sidan."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4663,12 +4780,12 @@ msgstr ""
 "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:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Avancerat"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4680,7 +4797,7 @@ msgstr ""
 "valt en felaktig drivrutin."
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4852,12 +4969,12 @@ msgid "Uninstalling Mageia"
 msgstr "Avinstallera Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Guide"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4869,7 +4986,7 @@ msgstr ""
 "för alla operativsystem."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4880,7 +4997,7 @@ msgstr ""
 "har du bara kvar Windows utan möjlighet att välja operativsystem."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4899,7 +5016,7 @@ msgstr ""
 "att frigöras."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4908,7 +5025,7 @@ msgstr ""
 "(FAT32 eller NTFS). Den blir tilldelad en enhetsbokstav."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4968,6 +5085,310 @@ msgstr ""
 "kommer att få en blank skärm i slutet vilket är normalt."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Däremot kommer de användare som du lägger till i efterhand i  "
+#~ "<emphasis>MCC - System - Hantera användare i systemet</emphasis> att ha "
+#~ "en hemkatalog som är både läs -och skrivskyddad."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Om du inte vill ha en hemkatalog som är läsbar för alla bör du enbart "
+#~ "lägga till en temporär användare nu, och lägga till de verkliga efter "
+#~ "omstarten."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD för multiarkitektur"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Båda arkitekturerna finns på samma medium, valet görs automatiskt efter "
+#~ "identifierad processor."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Använder endast XFCE-skrivbordsmiljö."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Alla språk är inte tillgängliga. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) SKA KONTROLLERAS!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Den innehåller icke-fri programvara."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Endast 32-bitars."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Med ett BIOS-system"
+
+#~ 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."
+#~ msgstr ""
+#~ "Du kan lägga till en post eller redigera förstavalet genom att klicka på "
+#~ "tillhörande knapp på skrärmen för <emphasis>Konfigurering av "
+#~ "starthanterare</emphasis> och ändra i fönstret som dyker upp."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Om du har du valt <code>Grub 2</code> som starthanterare så kan du inte "
+#~ "använda det här verktyget för att ändra poster i det här steget. Klicka "
+#~ "på 'Nästa'. Du måste ändra i <code>/boot/grub2/custom.cfg</code> manuellt "
+#~ "eller använda <code>grub-customizer</code>."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Några saker som kan ändras utan risk är att ändra etiketten av en post "
+#~ "och markera kryssrutan för att ange den som ska vara standard."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Du kan lägga till ett korrekt versionsnummer för en post eller döpa om "
+#~ "det helt."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Standardposten är det som systemet startar om du inte gör ett val när du "
+#~ "startar datorn."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Om du redigerar andra inställningar utan att veta vad du gör kan "
+#~ "resultera i ett system som inte går att starta. Var snäll och ändra inget "
+#~ "om du inte vet vad du gör."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "I det här fallet använder du Grub2-efi och du kan inte använda detta "
+#~ "verktyg för att ändra i det här steget. För att göra ändringar måste du "
+#~ "manuellt redigera i <code>/boot/grub2/custom.cfg</code> eller använda "
+#~ "grub-customizer. Det enda du kan göra här är att välja standardposten i "
+#~ "rullgardinsmenyn."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "När du klickat på knappen <guibutton>Nästa</guibutton> kommer du att se "
+#~ "en annan rullgardinsmeny där du kan välja upplösning i Grub2 som är en "
+#~ "grafisk starthanterare."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Om du föredrar olika inställningar för starthanteraren för de som är "
+#~ "automatiskt valda av installationen så kan du ändra dessa här."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Du har kanske redan ett operativsystem på din dator, i så fall måste du "
+#~ "välja om du vill lägga till Mageia in den existerande starthanteraren, "
+#~ "eller tillåta Mageia att skapa en ny."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Som standard kommer Mageia att skriva en ny GRUB (legacy)-starthanterare "
+#~ "på MBR (Master Boot Record) på din första hårddisk. Om du redan har andra "
+#~ "operativsystem installerade kommer Mageia att försöka lägga till dem i "
+#~ "din nya startmeny."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia erbjuder nu även GRUB2 som en valfri starthanterare tillsammans "
+#~ "med GRUB legacy och Lilo."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "Linuxsystem som använder GRUB2-starthanterare stöds för närvarande inte "
+#~ "av GRUB (legacy) och kommer inte att kännas igen om standard "
+#~ "starthanterare som används är GRUB."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Den bästa lösningen här är att använda GRUB2 som starthanterare, som är "
+#~ "tillgänglig på översiktssidan under installation."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Om du bestämmer dig för att använda en befintlig starthanterare måste du "
+#~ "komma ihåg att STANNA på översiktssidan under installationen. Klicka på "
+#~ "knappen <guibutton>Konfigurera</guibutton> för starthanterare där du kan "
+#~ "ändra var du vill installera starthanteraren."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Välj inte en enhet, t. ex. \"sda\" för då kommer du att skriva över din "
+#~ "nuvarande MBR. Du måste välja root-partitionen som du valde under "
+#~ "installationen tidigare, t. ex. sda7."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "För att klargöra, sda är en enhet, sda7 är en partition på den enheten."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Gå till tty2 med Ctrl+Alt+F2 och skriv <literal>df</literal> för att "
+#~ "kontrollera vilken din <literal>/</literal> (root) partition är. Ctrl+Alt"
+#~ "+F7 tar dig tillbaka till installationen."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Avancerat alternativ för starthanteraren"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "Om du har begränsat lagringsutrymme för <literal>/</literal>-partitionen "
+#~ "som innehåller <literal>/tmp</literal>, klicka på <guibutton>Avancerat</"
+#~ "guibutton> och kryssa i rutan <guilabel>Rensa /tmp vid varje start</"
+#~ "guilabel>. Det hjälper till att upprätthålla en viss mängd ledigt utrymme."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -4984,10 +5405,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
 #~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 #~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index 925b3f15..39826b38 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 12:01+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -181,26 +181,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Kullanıcı ve Süper Kullanıcı Yönetimi"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -208,12 +197,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: 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:43
+#: 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 "
@@ -234,7 +223,7 @@ msgstr ""
 "yazılmadığı denetlenir."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -244,12 +233,12 @@ msgstr ""
 "en iyisidir."
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "Bir kullanıcı girin"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -261,7 +250,7 @@ msgstr ""
 "bilgisayarında yaptığı diğer her şeyi  yapmaya yetkisi olur"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
@@ -270,7 +259,7 @@ msgstr ""
 "değiştirebilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
@@ -279,7 +268,7 @@ msgstr ""
 "girin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -291,7 +280,7 @@ msgstr ""
 "duyarlıdır.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -302,7 +291,7 @@ msgstr ""
 "bkz: <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -313,58 +302,39 @@ msgstr ""
 "aynı parolanın bulunduğunu denetleyebilsin."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr ""
 "Mageia' yı kurarken eklediğiniz her kullanıcı için herkes tarafından "
 "okunabilen (ancak yazılamayan) bir ev dizini oluşturulur."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"Ancak, yeni kurulumunuzu kullanırken, <emphasis>MDM - Sistem - Sistemdeki "
-"Kullanıcıları Ayarlayın</emphasis> ile eklediğiniz her kullanıcı için hem "
-"okuma hem de yazma korumalı bir ev dizini oluşturulur."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"Herkesin okuyabileceği bir ev dizini istemiyorsanız şu anda geçici bir "
-"kullanıcı eklemeniz ve gerçek kullanıcıyı bilgisayarınızı yeniden "
-"başlattıktan sonra eklemeniz önerilir."
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "Herkes tarafından okunabilen ev dizinleri tercihiniz ise diğer tüm "
 "kullanıcıları kurulum sırasında <emphasis>Yapılandırma - Özet</emphasis> "
 "adımında ekleyebilirsiniz. <emphasis>Kullanıcı yönetimi</emphasis>ni seçin."
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 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:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "Gelişmiş Kullanıcı Yönetimi"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -373,14 +343,14 @@ msgstr ""
 "kullanıcı için ayarları değiştirebilmenizi sağlayan bir ekran önerilir."
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 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:133
+#: en/addUser.xml:105
 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 "
@@ -391,7 +361,7 @@ msgstr ""
 "Konuk önemli dosyalarını bir USB belleğe kaydetmelidir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -403,7 +373,7 @@ msgstr ""
 "normal kullanıcılardan çok daha sınırlı erişim verir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -414,7 +384,7 @@ msgstr ""
 "dir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -425,7 +395,7 @@ msgstr ""
 "rakamdır.   Ne yaptığınızı bilmiyorsanız boş bırakın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -807,12 +777,12 @@ msgstr ""
 "adımlar</link> ile farklılaşır."
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "Masaüstü Seçimi"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "Depending on your selection here, you may be offered further screens to fine "
 "tune your choice."
@@ -821,7 +791,7 @@ msgstr ""
 "önerilebilir."
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -831,16 +801,17 @@ msgstr ""
 "Sunumu <guilabel>Ayrıntılar</guilabel> düğmesine tıklayarak kapatabilirsiniz"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -860,22 +831,23 @@ msgstr ""
 "az paket kurulur  ve göze hoş gelen özellikleri daha azdır."
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "Paket Grubu Seçimi"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -888,22 +860,22 @@ msgstr ""
 "görüntülenebilir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "İş İstasyonu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "Sunucu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "Grafiksel Ortam."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
@@ -912,10 +884,11 @@ msgstr ""
 "kullanabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <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\"></xref> yardımını okuyun."
@@ -1399,23 +1372,24 @@ msgstr ""
 "akıllıca olur."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: 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:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1428,7 +1402,7 @@ msgstr ""
 "işaretli OLMAMALIDIR; yoksa sisteminiz açılmayacaktır."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1440,7 +1414,7 @@ msgstr ""
 "görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1449,7 +1423,7 @@ msgstr ""
 "sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1458,7 +1432,7 @@ msgstr ""
 "Temizle</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1468,44 +1442,79 @@ msgstr ""
 "boyutlandırın veya silin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "İsteğiniz doğrultusunda her şeyi ayarlayana kadar devan edin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 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:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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 (yukarıya bakın)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+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 (yukarıya bakın)"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1516,7 +1525,7 @@ msgstr ""
 "bulduğu çözümlere ulaşabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1525,21 +1534,32 @@ msgstr ""
 "bölümlendirme düzeni ve içeriğine bağlı olarak değişecektir."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "Mevcut Disk Bölümü Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1548,12 +1568,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:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "Boş Alan Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1562,12 +1582,12 @@ msgstr ""
 "bu seçenek o alanı kullanacaktır."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:52
 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:47
+#: en/doPartitionDisks.xml:55
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1576,7 +1596,7 @@ msgstr ""
 "kullanmayı önerebilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1586,7 +1606,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:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1602,7 +1622,7 @@ msgstr ""
 "Kişisel dosyalarınızı yedeklemeniz önerilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1616,7 +1636,7 @@ msgstr ""
 "görüntüsüne bakın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1624,25 +1644,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "Tüm Diski Sil ve Kullan"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete 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:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1653,12 +1683,12 @@ msgstr ""
 "seçeneği kullanmayın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "Özel"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1666,19 +1696,19 @@ msgstr ""
 "Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Disk bölümleri boyutlandırma:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 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:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1687,14 +1717,14 @@ msgstr ""
 "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:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 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:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1702,17 +1732,17 @@ msgstr ""
 "ayarlanır"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "kalanı (en az 12/19) ise /home olarak ayarlanır"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1722,7 +1752,7 @@ msgstr ""
 "home için arta kalan alan."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1734,8 +1764,48 @@ msgstr ""
 "bağlanacaktır. \"Kişisel\" seçeneği doğru yapıldığının denetlenmesini "
 "sağlayan tek seçenektir."
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1754,17 +1824,17 @@ msgstr ""
 "öneririz. Şu ayarları kullanın: "
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "\"MIB\" \"için Hizala\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Önündeki boş alan (MiB):\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1878,27 +1948,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "Tebrikler"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1909,7 +1976,7 @@ msgstr ""
 "başlatabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1918,7 +1985,7 @@ msgstr ""
 "fazla varsa) işletim sistemleri arasında seçim yapabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:22
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1927,12 +1994,12 @@ msgstr ""
 "seçilecek ve başlatılacaktır."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Tadını çıkarın!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2067,6 +2134,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2724,30 +2796,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Çeşitli parametrelerin özeti"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2759,18 +2817,40 @@ msgstr ""
 "ve isterseniz <guibutton>Yapılandır</guibutton> düğmesine tıklayarak "
 "değiştirebilirsiniz."
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "Sistem parametreleri"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>Zaman Dilimi</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2781,12 +2861,12 @@ msgstr ""
 "\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>Ülke / Bölge</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2795,35 +2875,35 @@ msgstr ""
 "<xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>Önyükleyici</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 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:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr ""
 "Grub ve/veya Lilo' yu 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:75
+#: en/misc-params.xml:69
 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:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>Kullanıcı yönetimi</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2832,12 +2912,12 @@ msgstr ""
 "home</literal> dizinlerine sahip olacaklardır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>Hizmetler</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2847,7 +2927,7 @@ msgstr ""
 "bırakmanızı sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
@@ -2856,22 +2936,22 @@ msgstr ""
 "bilgisayarınızın düzgün işlemesini engelleyebilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:99
+#: en/misc-params.xml:93
 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:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "Donanım parametreleri"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>Klavye</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
@@ -2879,13 +2959,20 @@ 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
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>Fare</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
@@ -2894,12 +2981,12 @@ msgstr ""
 "ayarlayabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>Ses kartı</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2910,42 +2997,44 @@ msgstr ""
 "öntanımlı olan değilse sunulur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>Grafiksel arabirim</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 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:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "Ağ ve İnternet parametreleri"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>Ağ</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2958,7 +3047,7 @@ msgstr ""
 "application>'nde ayarlamanız iyi olacaktır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
@@ -2967,12 +3056,12 @@ msgstr ""
 "ayarlamayı unutmayın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>Vekil Sunucular</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2983,7 +3072,7 @@ msgstr ""
 "bilgisayarınızı yapılandırmanıza olanak sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "You may need to consult your systems administrator to get the parameters you "
 "need to enter here"
@@ -2992,17 +3081,17 @@ msgstr ""
 "danışmanız gerekebilir"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "Güvenlik"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>Güvenlik Düzeyi</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 msgid ""
 "Here you set the Security level for your computer, in most cases the default "
 "setting (Standard) is adequate for general use."
@@ -3011,17 +3100,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:206
+#: en/misc-params.xml:205
 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:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>Güvenlik Duvarı</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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."
@@ -3030,10 +3119,12 @@ msgstr ""
 "çalmaya uğraşan çakallar arasında duvar oluşturmaktadır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr ""
 "Sistem erişimi istediğiniz hizmetleri seçin. Yaptığınız seçimleri için "
 "bilgisayarınızı kullanım biçimine bağlı olmalıdır."
@@ -3046,26 +3137,39 @@ msgstr ""
 "unutmayın."
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "Yeniden Başlat"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
+msgstr ""
+"Önyükleyici kurulduğunda; bilgisayarınızı durdurmanız, çalışan CD' yi "
+"çıkarmanız ve bilgisayarınızı yeniden başlatmanız istenir. Yeniden "
+"başlattığınızda, indirme ilerleme çubuklarını görürsünüz. Bunlar yazılım "
+"veri kaynağı bilgilerinin indirilmeye başladığını ( Yazılım yönetimi "
+"bölümüne bakınız ) gösterir."
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "Önyükleyici kurulduğunda; bilgisayarınızı durdurmanız, çalışan CD' yi "
 "çıkarmanız ve bilgisayarınızı yeniden başlatmanız istenir. Yeniden "
@@ -3073,6 +3177,16 @@ msgstr ""
 "veri kaynağı bilgilerinin indirilmeye başladığını ( Yazılım yönetimi "
 "bölümüne bakınız ) gösterir."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3133,17 +3247,17 @@ msgstr ""
 "Merkezi'ndeki <guilabel>Güvenlik</guilabel> bölümünden yapabilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "ISO'ları seçin ve kullanın"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "Giriş"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
@@ -3152,12 +3266,12 @@ msgstr ""
 "doğrultusunda hangi kalıp dosyasını seçeceğinize yardımcı olacaktır."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "İki tür kurulum ortamı mevcuttur:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -3170,7 +3284,7 @@ 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:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -3182,22 +3296,22 @@ msgstr ""
 "seçeneğiz mevcuttur."
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 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:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "Ortam"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "Açıklama"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -3208,7 +3322,7 @@ msgstr ""
 "olarak kopyalanan ISO dosyasıdır."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -3217,39 +3331,39 @@ msgstr ""
 "link> bulabilirsiniz."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "Klasik kurulum ortamı"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "Ortak özellikler"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional 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:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr "Önceki sürümden yükseltme veya temiz bir kurulum yapabilirler."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "32 veya 64 bit mimari için faklı ortamlar. "
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
@@ -3258,57 +3372,24 @@ msgstr ""
 "araçları mevcuttur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 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><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD dual arch"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr ""
-"Her iki mimari de aynı ortam üzerindedir, seçim CPU testine göre otomatik "
-"olarak yapılır."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "Yalnız Xfce masaüstü kullanılır."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"Tüm diller mevcut değildir. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, "
-"sv, uk) DİLLERİ BULUNMAKTADIR!"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "Özgür olmayan yazılım içerir."
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Canlı Ortam"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3317,18 +3398,20 @@ msgstr ""
 "üzerine Mageia kurulur."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "Her bir ISO yalnız bir masaüstü ortamı içerir (KDE veya Gnome)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 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:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3339,63 +3422,57 @@ msgstr ""
 "emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 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:152
-msgid "Live CD KDE"
-msgstr "Canlı CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Canlı DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "Yalnız KDE masaüstü ortamı."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "Yalnız İngilizce."
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "Sadece 32 bit."
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "Tüm diller mevcuttur."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Canlı CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Canlı DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "Yalnız GNOME masaüstü ortamı."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Canlı DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "Tüm diller mevcuttur."
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Canlı DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "Yalnız KDE masaüstü ortamı."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "Boot-only CD ortamı"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3407,7 +3484,7 @@ msgstr ""
 "içermeyen küçük bir imajdır."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3417,13 +3494,19 @@ msgstr ""
 "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:212
+msgid "English language only."
+msgstr "Yalnız İngilizce."
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "Kurulumu başlatmak"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
@@ -3432,12 +3515,13 @@ msgstr ""
 "içerir."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
@@ -3446,17 +3530,17 @@ msgstr ""
 "içerir."
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "Ortamları indirme ve kontrol etme"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "İndirme"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3469,12 +3553,12 @@ msgstr ""
 "imkanı sağlamak gibi. Eğer http seçildiyse şöyle bir şey görebilirsiniz"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3486,22 +3570,22 @@ msgstr ""
 "şu pencere görüntülenir:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "Sabit diske kaydet seçeneğini işaretleyin."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "İndirilen ortamın bütünlüğünü kontrol etme"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3516,14 +3600,14 @@ msgstr ""
 "yanlıştır. Sonuç yanlışsa dosyayı tekrar indirmeniz gerekmektedir."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "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:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3532,7 +3616,7 @@ msgstr ""
 "bulunduğu/yol/dosyaadı.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3541,7 +3625,7 @@ msgstr ""
 "bulunduğu/yol/dosyaadı.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3550,17 +3634,17 @@ msgstr ""
 "(Bir süre beklemek durumunda olabilirsiniz) karşılaştırın. Örneğin:"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "ISO yakma veya atma"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3570,12 +3654,12 @@ msgstr ""
 "çalıştırılabilir bir ortam yapmaktır."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 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:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3589,12 +3673,12 @@ msgstr ""
 "\">buradaki Mageia wiki sayfasına</link> bakınız."
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 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:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3603,7 +3687,7 @@ msgstr ""
 "sistemi önyükleme ve kurulum için kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3614,7 +3698,7 @@ msgstr ""
 "imaj boyutuna indirgenir."
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 msgid ""
 "To recover the original capacity, you must redo partitioning and re-format "
 "the USB stick."
@@ -3623,12 +3707,12 @@ msgstr ""
 "yeniden biçimlendirmelisiniz."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:376
+#: en/SelectAndUseISOs2.xml:336
 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:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3638,17 +3722,17 @@ msgstr ""
 "bir araç kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 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:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "Deneyebilecekleriniz:"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3657,7 +3741,7 @@ msgstr ""
 "imajı\" seçeneğini kullanarak;"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3666,12 +3750,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 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:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3680,17 +3764,17 @@ msgstr ""
 "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:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "Konsolu açın"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3699,12 +3783,12 @@ msgstr ""
 "unutmayın)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
@@ -3714,17 +3798,17 @@ msgstr ""
 "gelmektedir)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3735,7 +3819,7 @@ msgstr ""
 "başlayan aygıt adını görürsünüz:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3777,7 +3861,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3787,7 +3871,7 @@ msgstr ""
 "görünüyor."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3796,12 +3880,12 @@ msgstr ""
 "userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 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:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3810,37 +3894,37 @@ msgstr ""
 "iso of=/dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 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:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "USB belleğinizi çıkartıp işlemi tamamlayın"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "Ülke/Bölge seçin"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3849,7 +3933,7 @@ msgstr ""
 "Kablosuz ağ kullanımınızı engelleyebilir."
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3858,7 +3942,7 @@ msgstr ""
 "tıklayın ve ülkenizi/bölgenizi orada seçin."
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3871,21 +3955,20 @@ msgstr ""
 "seçiminizi uygulayacaktır."
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "Girdi yöntemi:"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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 "
 "(listenin sonunda) seçebilirsiniz. Girdi yöntemleri kullanıcıların birden "
@@ -3898,10 +3981,11 @@ msgstr ""
 "kurulabilirler."
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "Kurulum sırasında girdi yöntemi kurulumunu atlamışsanız, bu işleve "
@@ -4238,358 +4322,392 @@ msgstr ""
 "seçeneğini seçin."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: 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><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi "
+"için: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "Önyükleyici ana seçenekleri"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "Bir Bios sistem ile"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "Önyükleyici ana seçenekleri"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"<emphasis>Önyükleme Yapılandırması</emphasis> ekranında ve üstünde açılan "
-"ekranda düzenleme yaparak bir girdi ekleyebilir veya seçtiğiniz bir girdiyi "
-"değiştirebilirsiniz."
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "Bir UEFI sistem ile"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"Eğer önyükleyici olarak <code>Grub 2</code>'yi seçerseniz 'İleri' aşamasında "
-"girdileri düzenlemek için bu aracı kullanamazsınız. <code>/boot/grub2/custom."
-"cfg</code> dosyasını elle düzenlemeniz veya yerine <code>grub-customizer</"
-"code> kullanmanız gerekiyor."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+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:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "Bir UEFI sistem ile"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
 msgstr ""
-"Risk almadan yapılabilecek bazı şeyler, bir girdinin etiketini değiştirmek "
-"ve girdiyi yanındaki kutucuğu işaretleyerek öntanımlı olarak belirlemektir."
+"Bir UEFI sistemde kullanıcı arayüzü biraz farklıdır çünkü sadece Grub2-efi "
+"mevcut olduğundan önyükleyici seçemezsiniz."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Bir girdinin uygun sürüm numarasını ekleyebilir veya tümüyle yeniden "
-"adlandırabilirsiniz."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
-"Öntanımlı girdi, önyükleme ekranında bir seçim yapmadıysanız sistemin "
-"önyükleme yapacağı girdidir."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
 msgstr ""
-"Diğer hususları değiştirmek önyükleme yapamayan bir sistemle sizi baş başa "
-"bırakabilir.  Lütfen ne yaptığınızı bilmiyorsanız yeni bir şeyler denemeye "
-"kalkmayın."
+"Mageia bilgisayarınıza kurduğunuz ilk sistemse, kurulum aracı önyükleyiciyi "
+"(Grub2-efi) taşımak üzere bir ESP (EFI Sistem Disk Bölümü) oluşturacaktır. "
+"Bilgisayarınızda  önceden bir UEFI işleim sistemi (Mesela Windows 8) "
+"kuruluysa Mageia kurulum aracı Windows tarafından oluşturulmuş olan mevcut "
+"ESP alanını algılayarak grub2-efi'yi ekleyecektir. Birden fazla ESP' nin bir "
+"arada olması mümkün ise de sadece bir tane olması önerilir; çünkü kaç "
+"işletim sistemi kurulu olursa olsun biri yeterlidir."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "Bir UEFI sistem ile"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "Bir Mageia önyükleyicisi kullanmak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"Bu durumda Grub2-efi kullanmaktasınız ve şu aşamada girdileri düzenlemek "
-"için bu aracı kullanamazsınız. Bunu yapabilmek için <code>/boot/grub2/custom."
-"cfg</code> dosyasını elle düzenlemeli veya <code>grub-customizer</code> "
-"aracını kullanmalısınız. Burada yapabileceğiniz tek şey açılır menüden "
-"öntanımlı girdiyi seçmektir."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"<guibutton>İleri</guibutton> düğmesine tıkladıktan sonra, grafiksel bir "
-"önyükleyici olan Grub2 için ekran çözünürlüğünü ayarlamanızı sağlayan bir "
-"başka açılır menü görüntülenir."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "Önyükleyici ana seçenekleri"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "Mevcut bir önyükleyiciyi kullanmak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
+"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."
+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 "
+"önyükleme kurulum uygulamasını çalıştırmak onu algılayabilir ve "
+"kendiliğinden ekleyebilir. Sorularınız için işletim sisteminin belgelerine "
+"bakın."
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
 msgstr ""
-"Kurulum aracı tarafından kendiliğinden seçilenlerden farklı önyükleme "
-"ayarları tercih ediyorsanız burada değiştirebilirsiniz."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"Makinenizde bir başka işletim sistemi daha kurulu olabilir. Bu durumda "
-"mevcut önyükleyiciye Mageia' yı eklemek veya Mageia' nın yeni bir "
-"önyükleyici oluşturmasına izin vermek arasında tercih yapmalısınız."
 
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Mageia grafik menüleri güzeldir :"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "Bir Mageia önyükleyicisi kullanmak"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
 msgstr ""
-"Öntanımlı olarak Mageia, ilk sabit diskteki MBR (Birincil Önyükleme Kaydı) "
-"içine yeni bir GRUB (eski) önyükleyiciyi yazar. Başka işletim sistemleri "
-"önceden kuruluysa Mageia bunları kendi yeni önyükleme menüsüne eklemeyi "
-"dener."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
 msgstr ""
-"Mageia, eski GRUB ve Lilo' ya ek olarak GRUB2 önyükleyiciyi de tercihe bağlı "
-"olarak sunmaktadır."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
+msgstr ""
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<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."
 msgstr ""
-"GRUB2 önyükleyiciyi kullanan Linux sistemleri şimdilik GRUB (eski) "
-"tarafından desteklenmemektedir ve öntanımlı GRUB kullanıldığında "
-"algılanmayacaklardır."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
 msgstr ""
-"Buradaki en iyi çözüm kurulum sırasında Özet sayfasından erişebileceğiniz "
-"GRUB2 önyükleyiciyi kullanmak olacaktır."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "Mevcut bir önyükleyiciyi kullanmak"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
+msgid ""
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"Mevcut bir önyükleyiciyi kullanmaya karar verirseniz kurulum sırasında Özet "
-"sayfasında DURMALI ve önyükleyici kurulum konumunu değiştirmenizi sağlayan "
-"Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine basmalısınız."
+"<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."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>Hizmetler</guilabel>:"
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"Bir aygıt, mesela \"sda\" seçmeyin yoksa mevcut MBR üzerine yazarsınız. "
-"Önceki disk bölümlendirme aşamasında ayarladığınız,  sda7 gibi, kök bölümünü "
-"seçmelisiniz."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
+msgid ""
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"Açık olmak gerekirse, sda bir aygıt ve sda7 ise o aygıt üzerindeki bir "
-"bölümdür."
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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."
 msgstr ""
-"Ctrl+Alt+F2 ile tty2 terminaline gidin ve <literal>/</literal> (kök) bölümün "
-"nerede olduğunu denetlemek için <literal>df</literal> komutunu çalıştırın. "
-"Ctrl+Alt+F7 sizi kurulum ekranına döndürür."
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 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."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 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 "
-"önyükleme kurulum uygulamasını çalıştırmak onu algılayabilir ve "
-"kendiliğinden ekleyebilir. Sorularınız için işletim sisteminin belgelerine "
-"bakın."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "Önyükleyici gelişmiş seçenekleri"
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
-msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
 msgstr ""
-"<literal>/tmp</literal> içeren <literal>/</literal> bölümü için kısıtlı "
-"alanınız varsa, <guibutton>Gelişmiş</guibutton> düğmesine tıklayarak "
-"<guilabel>Her açılışta /tmp temizle</guilabel> kutusunu işaretleyin. Böylece "
-"biraz boş alan kazanmanız mümkün olur."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"Bir UEFI sistemde kullanıcı arayüzü biraz farklıdır çünkü sadece Grub2-efi "
-"mevcut olduğundan önyükleyici seçemezsiniz."
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"Mageia bilgisayarınıza kurduğunuz ilk sistemse, kurulum aracı önyükleyiciyi "
-"(Grub2-efi) taşımak üzere bir ESP (EFI Sistem Disk Bölümü) oluşturacaktır. "
-"Bilgisayarınızda  önceden bir UEFI işleim sistemi (Mesela Windows 8) "
-"kuruluysa Mageia kurulum aracı Windows tarafından oluşturulmuş olan mevcut "
-"ESP alanını algılayarak grub2-efi'yi ekleyecektir. Birden fazla ESP' nin bir "
-"arada olması mümkün ise de sadece bir tane olması önerilir; çünkü kaç "
-"işletim sistemi kurulu olursa olsun biri yeterlidir."
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+msgid ""
+"<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
+"linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
-"Ne yaptığınızı gerçekten bilmediğiniz sürece \"Önyükleme Aygıtı\"nı "
-"değiştirmeyin."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
@@ -4639,22 +4757,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "DrakX bundan sonra diskleri doğru olarak yapılandırabilecektir."
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "Ses Yapılandırması"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4664,7 +4783,7 @@ msgstr ""
 "sürücünün ismi sunulur."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4679,7 +4798,7 @@ msgstr ""
 "guilabel> seçeneğini tıklayarak çalıştırın."
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4691,12 +4810,12 @@ msgstr ""
 "önerileri bulabilirsiniz."
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "Gelişmiş"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4707,7 +4826,7 @@ msgstr ""
 "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:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4879,12 +4998,12 @@ msgid "Uninstalling Mageia"
 msgstr "Mageia' yı Kaldırma"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "Nasıl"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4896,7 +5015,7 @@ msgstr ""
 "her işletim sistemi için geçerli değildir."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4908,7 +5027,7 @@ msgstr ""
 "seçmek üzere bir menü sunulmadan sadece Windows açılacaktır."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4927,7 +5046,7 @@ msgstr ""
 "alanı boşaltılacaktır."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4937,7 +5056,7 @@ msgstr ""
 "alacaktır."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4999,6 +5118,312 @@ msgstr ""
 "karşılaşabilirsiniz fakat bu durum gayet olağandır."
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "Ancak, yeni kurulumunuzu kullanırken, <emphasis>MDM - Sistem - Sistemdeki "
+#~ "Kullanıcıları Ayarlayın</emphasis> ile eklediğiniz her kullanıcı için hem "
+#~ "okuma hem de yazma korumalı bir ev dizini oluşturulur."
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "Herkesin okuyabileceği bir ev dizini istemiyorsanız şu anda geçici bir "
+#~ "kullanıcı eklemeniz ve gerçek kullanıcıyı bilgisayarınızı yeniden "
+#~ "başlattıktan sonra eklemeniz önerilir."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD dual arch"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr ""
+#~ "Her iki mimari de aynı ortam üzerindedir, seçim CPU testine göre otomatik "
+#~ "olarak yapılır."
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "Yalnız Xfce masaüstü kullanılır."
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "Tüm diller mevcut değildir. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, "
+#~ "ru, sv, uk) DİLLERİ BULUNMAKTADIR!"
+
+#~ msgid "It contains non free software."
+#~ msgstr "Özgür olmayan yazılım içerir."
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Canlı CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Sadece 32 bit."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Canlı CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "Bir Bios sistem ile"
+
+#~ 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."
+#~ msgstr ""
+#~ "<emphasis>Önyükleme Yapılandırması</emphasis> ekranında ve üstünde açılan "
+#~ "ekranda düzenleme yaparak bir girdi ekleyebilir veya seçtiğiniz bir "
+#~ "girdiyi değiştirebilirsiniz."
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "Eğer önyükleyici olarak <code>Grub 2</code>'yi seçerseniz 'İleri' "
+#~ "aşamasında girdileri düzenlemek için bu aracı kullanamazsınız. <code>/"
+#~ "boot/grub2/custom.cfg</code> dosyasını elle düzenlemeniz veya yerine "
+#~ "<code>grub-customizer</code> kullanmanız gerekiyor."
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr ""
+#~ "Risk almadan yapılabilecek bazı şeyler, bir girdinin etiketini "
+#~ "değiştirmek ve girdiyi yanındaki kutucuğu işaretleyerek öntanımlı olarak "
+#~ "belirlemektir."
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr ""
+#~ "Bir girdinin uygun sürüm numarasını ekleyebilir veya tümüyle yeniden "
+#~ "adlandırabilirsiniz."
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr ""
+#~ "Öntanımlı girdi, önyükleme ekranında bir seçim yapmadıysanız sistemin "
+#~ "önyükleme yapacağı girdidir."
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr ""
+#~ "Diğer hususları değiştirmek önyükleme yapamayan bir sistemle sizi baş "
+#~ "başa bırakabilir.  Lütfen ne yaptığınızı bilmiyorsanız yeni bir şeyler "
+#~ "denemeye kalkmayın."
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "Bu durumda Grub2-efi kullanmaktasınız ve şu aşamada girdileri düzenlemek "
+#~ "için bu aracı kullanamazsınız. Bunu yapabilmek için <code>/boot/grub2/"
+#~ "custom.cfg</code> dosyasını elle düzenlemeli veya <code>grub-customizer</"
+#~ "code> aracını kullanmalısınız. Burada yapabileceğiniz tek şey açılır "
+#~ "menüden öntanımlı girdiyi seçmektir."
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "<guibutton>İleri</guibutton> düğmesine tıkladıktan sonra, grafiksel bir "
+#~ "önyükleyici olan Grub2 için ekran çözünürlüğünü ayarlamanızı sağlayan bir "
+#~ "başka açılır menü görüntülenir."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr ""
+#~ "Kurulum aracı tarafından kendiliğinden seçilenlerden farklı önyükleme "
+#~ "ayarları tercih ediyorsanız burada değiştirebilirsiniz."
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "Makinenizde bir başka işletim sistemi daha kurulu olabilir. Bu durumda "
+#~ "mevcut önyükleyiciye Mageia' yı eklemek veya Mageia' nın yeni bir "
+#~ "önyükleyici oluşturmasına izin vermek arasında tercih yapmalısınız."
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "Öntanımlı olarak Mageia, ilk sabit diskteki MBR (Birincil Önyükleme "
+#~ "Kaydı) içine yeni bir GRUB (eski) önyükleyiciyi yazar. Başka işletim "
+#~ "sistemleri önceden kuruluysa Mageia bunları kendi yeni önyükleme menüsüne "
+#~ "eklemeyi dener."
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr ""
+#~ "Mageia, eski GRUB ve Lilo' ya ek olarak GRUB2 önyükleyiciyi de tercihe "
+#~ "bağlı olarak sunmaktadır."
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "GRUB2 önyükleyiciyi kullanan Linux sistemleri şimdilik GRUB (eski) "
+#~ "tarafından desteklenmemektedir ve öntanımlı GRUB kullanıldığında "
+#~ "algılanmayacaklardır."
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "Buradaki en iyi çözüm kurulum sırasında Özet sayfasından erişebileceğiniz "
+#~ "GRUB2 önyükleyiciyi kullanmak olacaktır."
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "Mevcut bir önyükleyiciyi kullanmaya karar verirseniz kurulum sırasında "
+#~ "Özet sayfasında DURMALI ve önyükleyici kurulum konumunu değiştirmenizi "
+#~ "sağlayan Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine "
+#~ "basmalısınız."
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "Bir aygıt, mesela \"sda\" seçmeyin yoksa mevcut MBR üzerine yazarsınız. "
+#~ "Önceki disk bölümlendirme aşamasında ayarladığınız,  sda7 gibi, kök "
+#~ "bölümünü seçmelisiniz."
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr ""
+#~ "Açık olmak gerekirse, sda bir aygıt ve sda7 ise o aygıt üzerindeki bir "
+#~ "bölümdür."
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "Ctrl+Alt+F2 ile tty2 terminaline gidin ve <literal>/</literal> (kök) "
+#~ "bölümün nerede olduğunu denetlemek için <literal>df</literal> komutunu "
+#~ "çalıştırın. Ctrl+Alt+F7 sizi kurulum ekranına döndürür."
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "Önyükleyici gelişmiş seçenekleri"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "<literal>/tmp</literal> içeren <literal>/</literal> bölümü için kısıtlı "
+#~ "alanınız varsa, <guibutton>Gelişmiş</guibutton> düğmesine tıklayarak "
+#~ "<guilabel>Her açılışta /tmp temizle</guilabel> kutusunu işaretleyin. "
+#~ "Böylece biraz boş alan kazanmanız mümkün olur."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -5015,10 +5440,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
 #~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 #~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index d200d15b..faa3cb25 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-02-10 18:38+0200\n"
-"PO-Revision-Date: 2017-02-10 18:37+0200\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
+"PO-Revision-Date: 2017-02-10 19:18+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -302,28 +302,24 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:80
-#, fuzzy
 msgid ""
 "Any user you add while installing Mageia, will have a both read and write "
 "protected home directory (umask=0027)."
 msgstr ""
 "Вміст домашніх каталогів всіх користувачів, записи яких буде створено під "
-"час встановлення Mageia, зможе читати будь-який користувач (але не "
-"записувати до цих каталогів дані)."
+"час встановлення Mageia, буде захищено від читання і запису (umask=0027)."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:83
-#, fuzzy
 msgid ""
 "You can add all extra needed users in the <emphasis>Configuration - Summary</"
 "emphasis> step during the install. Choose <emphasis>User management</"
 "emphasis>."
 msgstr ""
-"Якщо ви надаєте перевагу домашнім каталогам користувачів, вміст яких "
-"доступний всім іншим користувачам, вам варто додати всі записи майбутніх "
-"користувачів системи на кроці <emphasis>Налаштування - Резюме</emphasis> під "
-"час встановлення системи. Для керування записами користувачів виберіть пункт "
-"<emphasis>Керування користувачами</emphasis>."
+"Ви можете додати всі записи майбутніх користувачів системи на кроці "
+"<emphasis>Налаштування - Резюме</emphasis> під час встановлення системи. Для "
+"керування записами користувачів виберіть пункт <emphasis>Керування "
+"користувачами</emphasis>."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:87
@@ -1816,6 +1812,13 @@ msgid ""
 "partitioning\" option to be able to create it with the Installer like any "
 "other partition, just select BIOS boot partition as filesystem type."
 msgstr ""
+"Якщо ви користуєтеся застарілою системою (відомою як CSM або BIOS) із диском "
+"GPT, вам доведеться створити розділ для завантаження BIOS, якщо його ще не "
+"існує. Розмір розділу приблизно дорівнює 1 МіБ, він не матиме точки "
+"монтування. Виберіть пункт «Нетиповий поділ диска на розділи», щоб мати "
+"змогу створити такий розділ за допомогою засобу встановлення системи. "
+"Створення розділу подібне до створення будь-якого іншого розділу, але треба "
+"вибрати тип файлової системи «Розділ завантаження BIOS»."
 
 #. type: Content of: <section><note><mediaobject>
 #: en/doPartitionDisks.xml:169
@@ -2889,21 +2892,25 @@ msgid ""
 "As a general rule, default settings are recommended and you can keep them "
 "with 3 exceptions:"
 msgstr ""
+"Як правило, рекомендованим є використання типових параметрів. Ви можете "
+"нічого не змінювати, окрім трьох винятків:"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:24
 msgid "there are known issues with a default setting"
-msgstr ""
+msgstr "відомі певні недоліки у типових параметрах;"
 
 #. type: Content of: <section><note><para><itemizedlist><listitem><para>
 #: en/misc-params.xml:28
 msgid "the default setting has already been tried and it fails"
-msgstr ""
+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"
 msgstr ""
+"у розділах із докладною інформацією, наведених нижче, стверджується, що слід "
+"вибрати нетипові параметри."
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:39
@@ -3034,6 +3041,8 @@ 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
@@ -3194,7 +3203,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:216
-#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for. For more "
@@ -3202,7 +3210,7 @@ msgid ""
 msgstr ""
 "Виберіть служби, яким має бути дозволено доступ до вашої системи. Вибір "
 "служб залежатиме від призначення комп’ютера, на якому працює операційна "
-"система."
+"система. Докладніше про це у розділі <xref linkend=\"firewall\"/>."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
 #: en/misc-params.xml:222
@@ -3481,9 +3489,9 @@ msgstr ""
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:109
-#, fuzzy
 msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
-msgstr "Кожен ISO містить лише одне стільничне середовище (KDE або GNOME)."
+msgstr ""
+"Кожен ISO містить лише одне стільничне середовище (KDE, GNOME або Xfce)."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
@@ -3510,15 +3518,13 @@ msgstr "Містять невільне програмне забезпечен�
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:130
-#, fuzzy
 msgid "Live DVD Plasma"
-msgstr "Портативний DVD з KDE"
+msgstr "Портативний DVD з Плазмою"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:134
-#, fuzzy
 msgid "Plasma desktop environment only."
-msgstr "Лише стільничне середовище KDE."
+msgstr "Лише стільничне середовище Плазми."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
@@ -3538,15 +3544,13 @@ msgstr "Лише стільничне середовище GNOME."
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:166
-#, fuzzy
 msgid "Live DVD Xfce"
-msgstr "Портативний DVD з KDE"
+msgstr "Портативний DVD з Xfce"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:170
-#, fuzzy
 msgid "Xfce desktop environment only."
-msgstr "Лише стільничне середовище KDE."
+msgstr "Лише стільничне середовище Xfce."
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:185
@@ -4415,18 +4419,20 @@ 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)."
 msgstr ""
+"Для цього вам доведеться внести вручну зміни до /boot/grub2/custom.cfg або "
+"скористатися програмою для налаштовування GRUB (наприклад grub-customizer зі "
+"сховищ Mageia)."
 
 #. type: Content of: <section><note><para>
 #: 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>"
 msgstr ""
-"Докладніший опис параметрів ядра у застарілих системах та системах з UEFI "
-"можна знайти <link ns2:href=\"https://wiki.mageia.org/en/"
-"How_to_set_up_kernel_options\">тут</link>."
+"Щоб дізнатися більше, ознайомтеся із відповідною сторінкою нашої вікі: <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
@@ -4435,26 +4441,25 @@ msgstr "Основні параметри завантажувача"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:13
-#, fuzzy
 msgid "Bootloader interface"
-msgstr "Додаткові можливості керування завантажувачем"
+msgstr "Інтерфейс завантажувача"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:15
 msgid "By default, Mageia uses exclusively:"
-msgstr ""
+msgstr "Типово, Mageia ексклюзивно використовує:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:19
 msgid ""
 "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
-#, fuzzy
 msgid "Grub2-efi for a UEFI system."
-msgstr "Із системою UEFI"
+msgstr "Grub2-efi для системи UEFI."
 
 #. type: Content of: <section><section><tip><para>
 #: en/setupBootloader.xml:29
@@ -4464,7 +4469,7 @@ msgstr "Графічні меню Mageia виглядає чудово. :)"
 #. type: Content of: <section><section><section><title>
 #: en/setupBootloader.xml:33
 msgid "Grub2 on Legacy/MBR and Legacy/GPT systems"
-msgstr ""
+msgstr "Grub2 для застарілих систем із MBR та GPT"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/setupBootloader.xml:36
@@ -4491,20 +4496,18 @@ msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/setupBootloader.xml:52
-#, fuzzy
 msgid "Grub2-efi on UEFI systems"
-msgstr "Із системою UEFI"
+msgstr "Grub2-efi у системах UEFI"
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:54
-#, fuzzy
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose between with or without graphical menu"
 msgstr ""
 "Якщо ви користуєтеся системою з UEFI system, інтерфейс користувача трохи "
-"відрізнятиметься, оскільки ви не зможете вибрати завантажувач, доступним "
-"буде лише grub2-efi."
+"відрізнятиметься, оскільки ви не зможете вибирати між завантажувачем із "
+"графічним меню і без нього."
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/setupBootloader.xml:58
@@ -4552,7 +4555,7 @@ msgstr "Користування завантажувачем Mageia"
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:86
 msgid "By default, according to your system, Mageia writes a new:"
-msgstr ""
+msgstr "Типово, залежно від вашої системи, Mageia записує новий:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:90
@@ -4560,11 +4563,13 @@ msgid ""
 "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:95
 msgid "Grub2-efi bootloader into the ESP"
-msgstr ""
+msgstr "завантажувач Grub2-efi до ESP;"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:99
@@ -4617,7 +4622,7 @@ msgstr ""
 #. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:128
 msgid "Using the chain loading"
-msgstr ""
+msgstr "Використання ланцюгового завантаження"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:130
@@ -4696,7 +4701,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:182
-#, fuzzy
 msgid ""
 "<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
 "check that it matches with the one set above."
@@ -4753,6 +4757,8 @@ msgstr "Наступна сторінка"
 #: en/setupBootloader.xml:230
 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:235
@@ -4760,13 +4766,19 @@ 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 ""
+"<guilabel>Приєднати:</guilabel> за допомогою цього параметра ви можете "
+"передати ядру системи якісь дані або повідомити ядру про те, що слід надати "
+"вам більше інформації під час завантаження системи."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:241
+#, fuzzy
 msgid ""
-"P<guilabel>robe foreign OS</guilabel>: see above <link linkend="
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
 "\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
+"<guilabel>Зондування сторонньої ОС</guilabel>: див. вище розділ щодо <link "
+"linkend=\"setupMageiaBootloader\">використання завантажувача Mageia</link>"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:247
@@ -4782,6 +4794,9 @@ msgid ""
 "<emphasis role=\"bold\">Do not touch ESP or MBR</emphasis>: see above <link "
 "linkend=\"setupChainLoading\">Using the chain loading</link>"
 msgstr ""
+"<emphasis role=\"bold\">Не чіпати ESP або MBR</emphasis>: див. вище розділ "
+"щодо <link linkend=\"setupChainLoading\">використання ланцюгового "
+"завантаження</link>"
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index eb317bc0..c5cbb94d 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 19:18+0200\n"
 "PO-Revision-Date: 2016-07-17 12:01+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -177,26 +177,15 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "用户和管理员管理"
 
-#.  Started by marja,using Led43's text, on 2012 03 27 
-#.  NEEDS TO BE REVIEWED! 
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
-#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing 
-#.        about guest account there, is the box you can tick or untick to enable or 
-#.        disable it, the rest is about the normal user you're adding in the previous
-#.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct? 
-#.  JohnR 2012-04-19 Language proofreading  
-#.  marja 2012-04-24 Added screenshot 
-#.  marja 2013-04-26 added new note
+#.  Lebarhon: 20170210 updated for Mageia 6 (umask)
 #. type: Content of: <section><mediaobject>
-#: en/addUser.xml:28
+#: en/addUser.xml:9
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
-"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
-"\" format=\"PNG\"/> </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 ""
 "<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
 "\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
@@ -204,12 +193,12 @@ msgstr ""
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:39
+#: en/addUser.xml:20
 msgid "Set Administrator (root)  Password:"
 msgstr "设置管理员（root 账户）密码："
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:43
+#: 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 "
@@ -226,7 +215,7 @@ msgstr ""
 "较高。你需要在下方输入框中再次输入相同的密码，以确保你之前的密码没有输错。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:53
+#: en/addUser.xml:34
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
@@ -235,12 +224,12 @@ msgstr ""
 "符。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:61
+#: en/addUser.xml:42
 msgid "Enter a user"
 msgstr "输入用户名"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:64
+#: en/addUser.xml:45
 msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
@@ -250,21 +239,21 @@ msgstr ""
 "公软件或者玩游戏等是足够的。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:70
+#: en/addUser.xml:51
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
 msgstr "<guibutton>图标</guibutton>：若点击此按钮，则会改变用户图标。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:75
+#: en/addUser.xml:56
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
 msgstr "<guilabel>真实姓名</guilabel>：在文本框中输入用户的真名。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:80
+#: en/addUser.xml:61
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
 "drakx use a version of the users real name. <emphasis>The login name is case "
@@ -274,7 +263,7 @@ msgstr ""
 "置。<emphasis>登录名区分大小写。</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:86
+#: 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 "
@@ -284,7 +273,7 @@ msgstr ""
 "码强度。（参见 <xref linkend=\"givePassword\"/>）"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:92
+#: 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 "
@@ -294,53 +283,36 @@ msgstr ""
 "的密码是否一致。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:99
+#: en/addUser.xml:80
+#, fuzzy
 msgid ""
-"Any user you add while installing Mageia, will have a world readable (but "
-"write protected) home directory."
+"Any user you add while installing Mageia, will have a both read and write "
+"protected home directory (umask=0027)."
 msgstr "任何在安装 Mageia 时添加的用户将拥有一个全局可读（但写保护）的主目录。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:102
-msgid ""
-"However, while using your new install, any user you add in <emphasis>MCC - "
-"System - Manage users on system</emphasis> will have a home directory that "
-"is both read and write protected."
-msgstr ""
-"不过，在使用系统时，通过 <emphasis>Mageia 控制中心 - 系统 -管理系统用户</"
-"emphasis>添加的用户将拥有其他用户不可读且不可写的主目录。"
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:106
-msgid ""
-"If you don't want a world readable home directory for anyone, it is advised "
-"to only add a temporary user now and to add the real one(s)  after reboot."
-msgstr ""
-"若您不希望为任何人创建全局可读的主目录，则现在最好只添加一个临时用户，然后在"
-"重启后添加您所需要的用户。"
-
-#. type: Content of: <section><section><note><para>
-#: en/addUser.xml:110
+#: en/addUser.xml:83
+#, fuzzy
 msgid ""
-"If you prefer world readable home directories, you might want to add all "
-"extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
-"during the install. Choose <emphasis>User management</emphasis>."
+"You can add all extra needed users in the <emphasis>Configuration - Summary</"
+"emphasis> step during the install. Choose <emphasis>User management</"
+"emphasis>."
 msgstr ""
 "若您需要全局可读主目录，你可能需要在安装的<emphasis>配置 - 概要</emphasis>这"
 "一步中添加有此需要的用户。请在<emphasis>用户管理</emphasis>中进行此操作。。"
 
 #. type: Content of: <section><section><note><para>
-#: en/addUser.xml:115
+#: en/addUser.xml:87
 msgid "The access permissions can also be changed after the install."
 msgstr "也可以在安装完成后改变访问权限。"
 
 #. type: Content of: <section><section><info><title>
-#: en/addUser.xml:122
+#: en/addUser.xml:94
 msgid "Advanced User Management"
 msgstr "高级用户管理"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:125
+#: en/addUser.xml:97
 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."
@@ -349,12 +321,12 @@ msgstr ""
 "设置。"
 
 #. type: Content of: <section><section><para>
-#: en/addUser.xml:129
+#: en/addUser.xml:101
 msgid "Additionally, you can disable or enable a guest account."
 msgstr "此外，您还可以禁用或启用来宾账户。"
 
 #. type: Content of: <section><section><warning><para>
-#: en/addUser.xml:133
+#: en/addUser.xml:105
 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 "
@@ -364,7 +336,7 @@ msgstr ""
 "应当将他/她的临时文件存储于 U 盘等设备中。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:140
+#: en/addUser.xml:112
 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, "
@@ -374,7 +346,7 @@ msgstr ""
 "来宾登录并使用电脑，但对其使用更严格的访问权限控制。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:147
+#: en/addUser.xml:119
 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 "
@@ -384,7 +356,7 @@ msgstr ""
 "中添加），可能的选项有 Bash、Dash 和 Sh。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:153
+#: en/addUser.xml:125
 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 "
@@ -394,7 +366,7 @@ msgstr ""
 "您不确定如何设置，请将其留空。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/addUser.xml:159
+#: en/addUser.xml:131
 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 "
@@ -739,19 +711,19 @@ msgstr ""
 "\">Live 模式下会有额外的步骤</link>。"
 
 #. type: Content of: <section><info><title>
-#: en/chooseDesktop.xml:5
+#: en/chooseDesktop.xml:3
 msgid "Desktop Selection"
 msgstr "桌面环境选择"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:11
+#: en/chooseDesktop.xml:8
 msgid ""
 "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:13
+#: en/chooseDesktop.xml:11
 msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
@@ -761,16 +733,17 @@ msgstr ""
 "guilabel> 按钮来关闭幻灯片显示。"
 
 #. type: Content of: <section><mediaobject>
-#: en/chooseDesktop.xml:20
+#: en/chooseDesktop.xml:16
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.png\" "
+"align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><para>
-#: en/chooseDesktop.xml:26
+#: 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 "
@@ -787,22 +760,23 @@ msgstr ""
 "安装的软件包也更少。"
 
 #. type: Content of: <section><info><title>
-#: en/choosePackageGroups.xml:4
+#: en/choosePackageGroups.xml:3
 msgid "Package Group Selection"
 msgstr "选择软件包组"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
+#. Lebarhon 20170209 Updated SC
 #. type: Content of: <section><mediaobject>
-#: en/choosePackageGroups.xml:10
+#: en/choosePackageGroups.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
-"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
 "\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:16
+#: en/choosePackageGroups.xml:14
 msgid ""
 "Packages have been sorted into groups, to make choosing what you need on "
 "your system a lot easier. The groups are fairly self explanatory, however "
@@ -813,32 +787,33 @@ msgstr ""
 "鼠标移至该组的名称上方。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:23
+#: en/choosePackageGroups.xml:21
 msgid "Workstation."
 msgstr "工作区"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:27
+#: en/choosePackageGroups.xml:25
 msgid "Server."
 msgstr "服务器。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:31
+#: en/choosePackageGroups.xml:29
 msgid "Graphical Environment."
 msgstr "图形界面环境"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/choosePackageGroups.xml:35
+#: en/choosePackageGroups.xml:33
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
 msgstr "单独选择软件包：您可以使用此选项来手动添加/移除软件包。"
 
 #. type: Content of: <section><para>
-#: en/choosePackageGroups.xml:39
+#: en/choosePackageGroups.xml:38
+#, fuzzy
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
-"a minimal install (without or with X &amp; IceWM)."
+"Read <xref linkend=\"minimal-install\"/> for instructions on how to do a "
+"minimal install (without or with X &amp; IceWM)."
 msgstr ""
 "若要进行最小化安装（包含/不包含 X &amp; IceWM），请阅读 <xref linkend="
 "\"minimal-install\"></xref>。"
@@ -1275,23 +1250,24 @@ msgstr ""
 "性。推荐保留此选项。"
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:20
+#: en/diskdrake.xml:7
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "使用 DiskDrake 自定义磁盘分区方式"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:25
+#: en/diskdrake.xml:12
+#, fuzzy
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:34
+#: 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 "
@@ -1302,7 +1278,7 @@ msgstr ""
 "并且该分区不能被加密；否则，系统将无法启动。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: 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 "
@@ -1312,7 +1288,7 @@ msgstr ""
 "时预览操作后的效果。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:46
+#: 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."
@@ -1321,14 +1297,14 @@ msgstr ""
 "分别显示 sda、sdb、sdc 的磁盘布局。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:50
+#: en/diskdrake.xml:38
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr "点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:53
+#: en/diskdrake.xml:41
 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."
@@ -1337,43 +1313,77 @@ msgstr ""
 "点，改变其大小或擦除它。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:45
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "请继续，直到所需操作完成。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:60
+#: en/diskdrake.xml:48
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:64
+#: en/diskdrake.xml:52
+#, 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 above)"
+"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:69
+#: en/diskdrake.xml:57
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:68 en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:61
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:56
+#, fuzzy
+msgid ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:68
+#, fuzzy
+msgid ""
+"If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
+"partition is present with a correct type"
+msgstr ""
+"若您将 Mageia 安装在 UEFI 系统中，请确保磁盘上存在 ESP（EFI 系统分区）并被正"
+"确挂载至 /boot/EFI（见下）。"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/diskdrake.xml:72
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
 #. 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:10
+#: 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 "
@@ -1383,28 +1393,39 @@ msgstr ""
 "<application>Mageia</application> 的安装方法。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:15
+#: en/doPartitionDisks.xml:17
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr "根据特定硬盘布局和内容的不同，下列选项可能会有所不同。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:20
+#: en/doPartitionDisks.xml:22
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
-"\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:27
+#: en/doPartitionDisks.xml:35
 msgid "Use Existing Partitions"
 msgstr "使用现存的分区"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:30
+#: en/doPartitionDisks.xml:38
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1413,31 +1434,31 @@ msgstr ""
 "安装。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:44
 msgid "Use Free Space"
 msgstr "使用空闲空间"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:38
+#: en/doPartitionDisks.xml:46
 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:44
+#: en/doPartitionDisks.xml:52
 msgid "Use Free Space on a Windows Partition"
 msgstr "使用 Windows 分区中的空闲空间"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:47
+#: en/doPartitionDisks.xml:55
 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:51
+#: en/doPartitionDisks.xml:59
 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 "
@@ -1447,7 +1468,7 @@ msgstr ""
 "所有重要文件！"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:56
+#: en/doPartitionDisks.xml:64
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1461,7 +1482,7 @@ msgstr ""
 "移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:64
+#: en/doPartitionDisks.xml:72
 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 "
@@ -1473,7 +1494,7 @@ msgstr ""
 "图）。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:71
+#: en/doPartitionDisks.xml:79
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
@@ -1481,23 +1502,33 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:78
+#: en/doPartitionDisks.xml:92
 msgid "Erase and use Entire Disk."
 msgstr "擦除磁盘，并使用整个磁盘。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:81
+#: en/doPartitionDisks.xml:95
 msgid "This option will use the complete drive for Mageia."
 msgstr "此选项将会把整个硬盘空间用于安装 Mageia。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:84
+#: en/doPartitionDisks.xml:98
 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:87
+#: en/doPartitionDisks.xml:101
 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 "
@@ -1507,60 +1538,60 @@ msgstr ""
 "要使用此选项。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:108
 msgid "Custom"
 msgstr "自定义"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:96
+#: en/doPartitionDisks.xml:110
 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:102
+#: en/doPartitionDisks.xml:116
 msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:104
+#: en/doPartitionDisks.xml:118
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "安装程序将会根据下列规则使用可用空间："
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:109
+#: en/doPartitionDisks.xml:123
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr "若可用空间小于 50GB，则只创建 / 分区，不创建单独的 /home 分区。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:115
+#: en/doPartitionDisks.xml:129
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr "若总可用空间大于 50GB，则创建三个分区。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:120
+#: en/doPartitionDisks.xml:134
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr "其中 6/19 被分配给 / 分区，最大不超过 50GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:139
 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:129
+#: en/doPartitionDisks.xml:143
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "剩余部分（至少 12/19）被分配给 /home 分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:149
 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."
@@ -1569,7 +1600,7 @@ msgstr ""
 "及 106GB 的 /home 分区。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:140
+#: en/doPartitionDisks.xml:154
 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 /"
@@ -1579,8 +1610,48 @@ msgstr ""
 "若您使用 UEFI 系统，将自动检测并创建 ESP（EFI 系统分区），之后将其挂载到 /"
 "boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确"
 
+#. type: Content of: <section><note><para>
+#: en/doPartitionDisks.xml:161
+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 the \"Custom disk "
+"partitioning\" option to be able to create it with the Installer like any "
+"other partition, just select BIOS boot partition as filesystem type."
+msgstr ""
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:169
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:147
+#: en/doPartitionDisks.xml:188
 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 "
@@ -1595,17 +1666,17 @@ msgstr ""
 "议您使用其他的分区工具（如gparted）预先进行分区操作："
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:155
+#: en/doPartitionDisks.xml:196
 msgid "\"Align to\" \"MiB\""
 msgstr "“对齐到”“MiB”"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:198
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "“前面的自由空间（MiB）”“2”"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:159
+#: en/doPartitionDisks.xml:200
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "确保所有创建的分区的大小均为偶数倍 MB。"
@@ -1713,27 +1784,24 @@ msgid "Mageia 4"
 msgstr "Mageia 4"
 
 #. type: Content of: <section><info><title>
-#: en/exitInstall.xml:4
+#: en/exitInstall.xml:3
 msgid "Congratulations"
 msgstr "恭喜"
 
-#.  Started by marja on 2012 03 29 
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
-#.  marja - 2012-04-24 added screenshot and text 
-#.  same day, added "s" to "sytems"
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
 "format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:21
+#: 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 "
@@ -1741,7 +1809,7 @@ msgid ""
 msgstr "您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:25
+#: 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)."
@@ -1750,19 +1818,19 @@ msgstr ""
 "统）。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: 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:31
+#: en/exitInstall.xml:26
 msgid "Enjoy!"
 msgstr "Enjoy!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:33
+#: en/exitInstall.xml:28
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1885,6 +1953,11 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
+#. type: Content of: <section><figure>
+#: en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -2493,30 +2566,16 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "一些杂项"
 
-#.  Started by marja on 2012 03 31 
-#.  NEEDS TO BE WRITTEN AND REVIEWED! 
-#. marja - 2012 04 15 added some text, not much, unfortunately :( 
-#. marja 2012-04-24 added screenshots 
-#. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages 
-#. marja 2012-04-24 added some text in the drakxid-configureServices and 
-#.       the drakxid-miscellaneous section 
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
+#.  Lebarhon 2016 12 16 updated for Mageia 6. 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/misc-params.xml:33
+#: en/misc-params.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/misc-params.xml:38
+#: 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 "
@@ -2526,18 +2585,40 @@ msgstr ""
 "DrakX 会根据您的选择以及检测到的硬件自动生成合适的配置。您可以在此处检查或更"
 "改它们（点击 <guibutton>配置</guibutton> 按钮）。"
 
+#. 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:"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:24
+msgid "there are known issues with a default setting"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:28
+msgid "the default setting has already been tried and it fails"
+msgstr ""
+
+#. type: Content of: <section><note><para><itemizedlist><listitem><para>
+#: en/misc-params.xml:32
+msgid "something else is said in the detailed sections below"
+msgstr ""
+
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:45
+#: en/misc-params.xml:39
 msgid "System parameters"
 msgstr "系统参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:50
+#: en/misc-params.xml:44
 msgid "<guilabel>Timezone</guilabel>"
 msgstr "<guilabel>时区</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:52
+#: en/misc-params.xml:46
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
 "You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
@@ -2547,12 +2628,12 @@ msgstr ""
 "linkend=\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:58
+#: en/misc-params.xml:52
 msgid "<guilabel>Country / Region</guilabel>"
 msgstr "<guilabel>国家/地区</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:61
+#: en/misc-params.xml:55
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
@@ -2561,33 +2642,33 @@ msgstr ""
 "\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:67
+#: en/misc-params.xml:61
 msgid "<guilabel>Bootloader</guilabel>"
 msgstr "<guilabel>引导器</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:69
+#: en/misc-params.xml:63
 msgid "DrakX has made good choices for the bootloader setting."
 msgstr "DrakX 为引导器进行了自动设置。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:72
-msgid ""
-"Do not change anything, unless you know how to configure Grub and/or Lilo"
+#: en/misc-params.xml:66
+#, fuzzy
+msgid "Do not change anything, unless you know how to configure Grub2"
 msgstr "不更改任何选项，除非您懂得如何配置 GRUB 和/或 Lilo"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:75
+#: en/misc-params.xml:69
 msgid "For more information, see <xref linkend=\"setupBootloader\"/>"
 msgstr "更多信息，参见 <xref linkend=\"setupBootloader\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:80
+#: en/misc-params.xml:74
 msgid "<guilabel>User management</guilabel>"
 msgstr "<guilabel>用户管理</guilabel>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:83
+#: en/misc-params.xml:77
 msgid ""
 "You can add extra users here. They will each get their own <literal>/home</"
 "literal> directories."
@@ -2596,12 +2677,12 @@ msgstr ""
 "目录。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:89
+#: en/misc-params.xml:83
 msgid "<guilabel>Services</guilabel>:"
 msgstr "<guilabel>服务</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:91
+#: en/misc-params.xml:85
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
@@ -2609,53 +2690,60 @@ msgstr ""
 "系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:95
+#: en/misc-params.xml:89
 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:99
+#: en/misc-params.xml:93
 msgid "For more information, see <xref linkend=\"configureServices\"/>"
 msgstr "更多信息，参见 <xref linkend=\"configureServices\"/>."
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:106
+#: en/misc-params.xml:100
 msgid "Hardware parameters"
 msgstr "硬件参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:111
+#: en/misc-params.xml:105
 msgid "<guilabel>Keyboard</guilabel>:"
 msgstr "<guilabel>键盘</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:113
+#: en/misc-params.xml:107
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
 msgstr "在这里，您可以根据您所在的位置、使用的语言和键盘类型来设置键盘布局。"
 
+#. type: Content of: <section><section><itemizedlist><listitem><note><para>
+#: en/misc-params.xml:112
+msgid ""
+"If you notice a wrong keyboard layout and want to change it, keep in mind "
+"that your passwords are going to change too."
+msgstr ""
+
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:119
+#: en/misc-params.xml:118
 msgid "<guilabel>Mouse</guilabel>:"
 msgstr "<guilabel>鼠标</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:121
+#: en/misc-params.xml:120
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
 msgstr "您可以添加或配置其他触控设备、平板、轨迹球等。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:126
+#: en/misc-params.xml:125
 msgid "<guilabel>Sound card</guilabel>:"
 msgstr "<guilabel>声卡</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:129
+#: en/misc-params.xml:128
 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 "
@@ -2665,41 +2753,43 @@ msgstr ""
 "动）时，才会提示您进行选择。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:136
+#: en/misc-params.xml:135
 msgid "<guilabel>Graphical interface</guilabel>:"
 msgstr "<guilabel>图形界面</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:139
+#: en/misc-params.xml:138
 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:142
+#: en/misc-params.xml:141
 msgid "For more information, see <xref linkend=\"configureX_chooser\"/>."
 msgstr "更多信息，参见 <xref linkend=\"configureX_chooser\"/>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/misc-params.xml:148
+#: en/misc-params.xml:147
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
-#: en/misc-params.xml:156
+#: en/misc-params.xml:155
 msgid "Network and Internet parameters"
 msgstr "网络和 Internet 参数"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:162
+#: en/misc-params.xml:161
 msgid "<guilabel>Network</guilabel>:"
 msgstr "<guilabel>网络</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:164
+#: en/misc-params.xml:163
 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 "
@@ -2710,19 +2800,19 @@ msgstr ""
 "Nonfree 软件仓库，那么您最好等到重启后再进行这一操作。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
-#: en/misc-params.xml:171
+#: en/misc-params.xml:170
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
 msgstr "当您添加了网卡后，请不要忘记用防火墙对该接口进行管理。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:178
+#: en/misc-params.xml:177
 msgid "<guilabel>Proxies</guilabel>:"
 msgstr "<guilabel>代理</guilabel>："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:180
+#: en/misc-params.xml:179
 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 "
@@ -2732,51 +2822,53 @@ msgstr ""
 "服务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:185
+#: en/misc-params.xml:184
 msgid ""
 "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:194
+#: en/misc-params.xml:193
 msgid "Security"
 msgstr "安全"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:199
+#: en/misc-params.xml:198
 msgid "<guilabel>Security Level</guilabel>:"
 msgstr "<guilabel>安全等级</guilabel>："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:202
+#: en/misc-params.xml:201
 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:206
+#: en/misc-params.xml:205
 msgid "Check the option which best suits your usage."
 msgstr "请勾选您认为合适的选项。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:211
+#: en/misc-params.xml:210
 msgid "<guilabel>Firewall</guilabel>:"
 msgstr "<guilabel>防火墙</guilabel>："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml:213
+#: en/misc-params.xml:212
 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:217
+#: en/misc-params.xml:216
+#, fuzzy
 msgid ""
 "Select the services that you wish to have access to your system. Your "
-"selections will depend on what you use your computer for."
+"selections will depend on what you use your computer for. For more "
+"information, see <xref linkend=\"firewall\"/>."
 msgstr "请选择允许访问本系统的服务。您的选项应当基于计算机的期望用途。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
@@ -2785,31 +2877,52 @@ msgid "Bear in mind that allowing everything (no firewall) may be very risky."
 msgstr "请牢记：允许所有服务（即不启用防火墙）是非常危险的。"
 
 #. type: Content of: <section><info><title>
-#: en/reboot.xml:9
+#: en/reboot.xml:3
 msgid "Reboot"
 msgstr "重新启动"
 
-#. type: Content of: <section><mediaobject>
-#: en/reboot.xml:13
+#. type: Content of: <section><para>
+#: en/reboot.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"Once the bootloader has been installed, you will be prompted to halt your "
+"computer, remove the live CD and restart the computer, click on <emphasis "
+"role=\"bold\"><guibutton>Finish</guibutton></emphasis> and act as "
+"asked<emphasis role=\"bold\"> in this order!</emphasis>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"在安装了引导起之后，程序将提示您关闭计算机，移除 Live CD 并重启计算机。重启"
+"后，您将会看到一个下载进度条，它将提示您正在下载的软件媒体（参见“软件管"
+"理”）。"
+
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:20
+#, fuzzy
 msgid ""
-"Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you "
-"will see a succession of download progress bars. These indicate that the "
-"software media are being downloaded (see Software management)."
+"When you restart, you will see a succession of download progress bars.  "
+"These indicate that the software media are being downloaded (see Software "
+"management)."
 msgstr ""
 "在安装了引导起之后，程序将提示您关闭计算机，移除 Live CD 并重启计算机。重启"
 "后，您将会看到一个下载进度条，它将提示您正在下载的软件媒体（参见“软件管"
 "理”）。"
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:25
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.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><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -2869,29 +2982,29 @@ msgstr ""
 "调整安全设置。"
 
 #. type: Content of: <section><info><title>
-#: en/SelectAndUseISOs2.xml:5
+#: en/SelectAndUseISOs2.xml:7
 msgid "Select and use ISOs"
 msgstr "选择和使用 ISO"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:9
+#: en/SelectAndUseISOs2.xml:11
 msgid "Introduction"
 msgstr "简介"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:11
+#: en/SelectAndUseISOs2.xml:13
 msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr "Mageia 通过 ISO 镜像进行分发。此页将帮助您选择所需的镜像。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:14
+#: en/SelectAndUseISOs2.xml:16
 msgid "There is two families of media:"
 msgstr "有两种类型的媒介："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:18
+#: en/SelectAndUseISOs2.xml:20
 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. "
@@ -2902,7 +3015,7 @@ msgstr ""
 "装类型可以给予您最大限度的灵活性，尤其是选择所需安装的桌面环境。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:26
+#: en/SelectAndUseISOs2.xml:28
 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 "
@@ -2912,22 +3025,22 @@ msgstr ""
 "样。这种安装的过程更加简单，但您可做的选择也相应减少。"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:33
+#: en/SelectAndUseISOs2.xml:35
 msgid "Details are given in the next sections."
 msgstr "下一节中将涉及有关细节。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:37
+#: en/SelectAndUseISOs2.xml:39
 msgid "Media"
 msgstr "介质"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:40
+#: en/SelectAndUseISOs2.xml:42
 msgid "Definition"
 msgstr "定义"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:42
+#: en/SelectAndUseISOs2.xml:44
 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 "
@@ -2936,7 +3049,7 @@ msgstr ""
 "媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:46
+#: en/SelectAndUseISOs2.xml:48
 msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
@@ -2945,93 +3058,62 @@ msgstr ""
 "到它们。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:50
+#: en/SelectAndUseISOs2.xml:52
 msgid "Classical installation media"
 msgstr "传统安装媒介"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:53 en/SelectAndUseISOs2.xml:122
-#: en/SelectAndUseISOs2.xml:228
+#: en/SelectAndUseISOs2.xml:55 en/SelectAndUseISOs2.xml:100
+#: en/SelectAndUseISOs2.xml:188
 msgid "Common features"
 msgstr "通用特性"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:57
+#: en/SelectAndUseISOs2.xml:59
 msgid "These ISOs use the traditional installer called drakx."
 msgstr "这些 ISO 使用传统的安装器（drakx）。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:62
+#: en/SelectAndUseISOs2.xml:64
 msgid ""
 "They are able to make a clean install or an update from previous releases."
 msgstr "它们可以用于全新安装，或更新之前的版本。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:69
+#: en/SelectAndUseISOs2.xml:71
 msgid "DVD"
 msgstr "DVD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:73
+#: en/SelectAndUseISOs2.xml:75
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "媒介有 32 位和 64 位两种架构之分。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:77
+#: en/SelectAndUseISOs2.xml:79
 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:82
+#: en/SelectAndUseISOs2.xml:84
 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:87
+#: en/SelectAndUseISOs2.xml:89
 msgid ""
 "You'll be given the choice during the installation to add non free software."
 msgstr "您可以在安装时添加非自由软件。"
 
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:94
-msgid "DVD dual arch"
-msgstr "DVD 双架构"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:98
-msgid ""
-"Both architectures are present on the same medium, the choice is made "
-"automatically according to the detected CPU."
-msgstr "同一媒介中包含两种架构。程序将根据检测到的 CPU 类型自动做出选择。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:103
-msgid "Uses Xfce desktop only."
-msgstr "仅使用 Xfce 桌面。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:107
-msgid ""
-"Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
-"pt, ru, sv, uk) TO BE CHECKED!"
-msgstr ""
-"并非所有语言都有完整支持。（be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, "
-"sv, uk）请认真核对！"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:112
-msgid "It contains non free software."
-msgstr "其中包含非自由软件。"
-
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:119
+#: en/SelectAndUseISOs2.xml:97
 msgid "Live media"
 msgstr "Live 媒介"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:126
+#: en/SelectAndUseISOs2.xml:104
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
@@ -3039,18 +3121,20 @@ msgstr ""
 "可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:131
-msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
+#: en/SelectAndUseISOs2.xml:109
+#, fuzzy
+msgid "Each ISO contains only one desktop environment (KDE, GNOME or Xfce)."
 msgstr "每个 ISO 仅包含一种桌面环境（KDE 或 GNOME）。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
-#: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
+#: en/SelectAndUseISOs2.xml:114 en/SelectAndUseISOs2.xml:142
+#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
+#: en/SelectAndUseISOs2.xml:208
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "媒介有 32 位和 64 位两种架构之分。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:140
+#: en/SelectAndUseISOs2.xml:118
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
 "installations, they cannot be used to upgrade from previous releases.</"
@@ -3060,63 +3144,57 @@ msgstr ""
 "级。</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:146
+#: en/SelectAndUseISOs2.xml:124
 msgid "They contain non free software."
 msgstr "其中包含非自由软件。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:152
-msgid "Live CD KDE"
-msgstr "Live CD KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
-msgid "KDE desktop environment only."
+#: en/SelectAndUseISOs2.xml:134
+#, fuzzy
+msgid "Plasma desktop environment only."
 msgstr "仅包含 KDE 桌面环境。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
-#: en/SelectAndUseISOs2.xml:252
-msgid "English language only."
-msgstr "仅包含英语支持。"
-
-#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
-msgid "32 bit only."
-msgstr "仅使用 32 位架构。"
+#: en/SelectAndUseISOs2.xml:138 en/SelectAndUseISOs2.xml:156
+#: en/SelectAndUseISOs2.xml:174
+msgid "All languages are present."
+msgstr "包含所有语言支持。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:170
-msgid "Live CD GNOME"
-msgstr "Live CD GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Live DVD GNOME"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
+#: en/SelectAndUseISOs2.xml:152
 msgid "GNOME desktop environment only."
 msgstr "仅包含 GNOME 桌面环境。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:188
-msgid "Live DVD KDE"
+#: en/SelectAndUseISOs2.xml:166
+#, fuzzy
+msgid "Live DVD Xfce"
 msgstr "Live DVD KDE"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
-msgid "All languages are present."
-msgstr "包含所有语言支持。"
-
-#. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:206
-msgid "Live DVD GNOME"
-msgstr "Live DVD GNOME"
+#: en/SelectAndUseISOs2.xml:170
+#, fuzzy
+msgid "Xfce desktop environment only."
+msgstr "仅包含 KDE 桌面环境。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:225
+#: en/SelectAndUseISOs2.xml:185
 msgid "Boot-only CD media"
 msgstr "仅用于引导的 CD"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:232
+#: en/SelectAndUseISOs2.xml:192
 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 "
@@ -3128,7 +3206,7 @@ msgstr ""
 "络或互联网。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:241
+#: en/SelectAndUseISOs2.xml:201
 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 "
@@ -3137,42 +3215,49 @@ msgstr ""
 "这类媒介非常小巧（小于 100 MB），适用于不方便下载完整版 DVD、没有 DVD 驱动器"
 "或不支持 USB 引导的电脑。"
 
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
+#: en/SelectAndUseISOs2.xml:212
+msgid "English language only."
+msgstr "仅包含英语支持。"
+
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:258
-msgid "boot.iso"
-msgstr "boot.iso"
+#: en/SelectAndUseISOs2.xml:218
+#, fuzzy
+msgid "netinstall.iso"
+msgstr "启动安装"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:262
+#: en/SelectAndUseISOs2.xml:222
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
 msgstr "仅包含自由软件，适用于不希望使用非自由软件的人。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+#, fuzzy
+msgid "netinstall-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:273
+#: en/SelectAndUseISOs2.xml:233
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr "包含部分用户所需的非自由软件（主要为驱动、编码器）。"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:282
+#: en/SelectAndUseISOs2.xml:242
 msgid "Downloading and Checking Media"
 msgstr "下载和检查媒介"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:285
+#: en/SelectAndUseISOs2.xml:245
 msgid "Downloading"
 msgstr "下载中"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:287
+#: en/SelectAndUseISOs2.xml:247
 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 "
@@ -3184,12 +3269,12 @@ msgstr ""
 "载，您可能会看到类似下列情形"
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:294
+#: en/SelectAndUseISOs2.xml:254
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:299
+#: en/SelectAndUseISOs2.xml:259
 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>. "
@@ -3199,22 +3284,22 @@ msgstr ""
 "保留它们以便<link linkend=\"integrity\">后续使用</link>。之后，窗口将会显示："
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:304
+#: en/SelectAndUseISOs2.xml:264
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:309
+#: en/SelectAndUseISOs2.xml:269
 msgid "Check the radio button Save File."
 msgstr "点击“保存文件”选项。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:313
+#: en/SelectAndUseISOs2.xml:273
 msgid "Checking the downloaded media integrity"
 msgstr "检查下载文件的完整性"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:316
+#: en/SelectAndUseISOs2.xml:276
 msgid ""
 "Both checksums are hexadecimal numbers calculated by an algorithm from the "
 "file to be downloaded. When you ask these algorithms to recalculate this "
@@ -3227,12 +3312,12 @@ msgstr ""
 "下载失败（文件可能不完整或已损坏），您应当重新下载。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:323
+#: en/SelectAndUseISOs2.xml:283
 msgid "Open a console, no need to be root, and:"
 msgstr "打开一个终端（无需以 root 身份操作），然后："
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:325
+#: en/SelectAndUseISOs2.xml:285
 msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
@@ -3241,7 +3326,7 @@ msgstr ""
 "image/file.iso</userinput>。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:328
+#: en/SelectAndUseISOs2.xml:288
 msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
@@ -3250,7 +3335,7 @@ msgstr ""
 "image/file.iso</userinput>。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:331
+#: en/SelectAndUseISOs2.xml:291
 msgid ""
 "and compare the obtained number on your computer (you may have to wait for a "
 "while) with the number given by Mageia. Example:"
@@ -3258,17 +3343,17 @@ msgstr ""
 "然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
 
 #. type: Content of: <section><section><section><mediaobject>
-#: en/SelectAndUseISOs2.xml:335
+#: en/SelectAndUseISOs2.xml:295
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/SelectAndUseISOs2.xml:345
+#: en/SelectAndUseISOs2.xml:305
 msgid "Burn or dump the ISO"
 msgstr "刻录或转储 ISO"
 
 #. type: Content of: <section><section><para>
-#: en/SelectAndUseISOs2.xml:347
+#: en/SelectAndUseISOs2.xml:307
 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 boot-able medium."
@@ -3277,12 +3362,12 @@ msgstr ""
 "制，其目的是创建一个可引导的媒体。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:352
+#: en/SelectAndUseISOs2.xml:312
 msgid "Burning the ISO to a CD/DVD"
 msgstr "将ISO文件刻录到CD或DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:354
+#: en/SelectAndUseISOs2.xml:314
 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 "
@@ -3294,12 +3379,12 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wiki</link>。"
 
 #. type: Content of: <section><section><section><title>
-#: en/SelectAndUseISOs2.xml:361
+#: en/SelectAndUseISOs2.xml:321
 msgid "Dump the ISO to a USB stick"
 msgstr "写入 ISO 到 U 盘"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:363
+#: en/SelectAndUseISOs2.xml:323
 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."
@@ -3308,7 +3393,7 @@ msgstr ""
 "U 盘来引导和安装系统。"
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:367
+#: en/SelectAndUseISOs2.xml:327
 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 "
@@ -3318,19 +3403,19 @@ msgstr ""
 "容量将会（暂时）缩减为镜像大小。"
 
 #. type: Content of: <section><section><section><para>
-#: en/SelectAndUseISOs2.xml:372
+#: en/SelectAndUseISOs2.xml:332
 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:376
+#: en/SelectAndUseISOs2.xml:336
 msgid "Using a graphical tool within Mageia"
 msgstr "使用 Mageia 的图形化工具"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:378
+#: en/SelectAndUseISOs2.xml:338
 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>"
@@ -3340,17 +3425,17 @@ msgstr ""
 "具来操作。"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:382
+#: en/SelectAndUseISOs2.xml:342
 msgid "Using a graphical tool within Windows"
 msgstr "使用 Windows 下的图形化工具"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:384
+#: en/SelectAndUseISOs2.xml:344
 msgid "You could try:"
 msgstr "您可以尝试："
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:386
+#: en/SelectAndUseISOs2.xml:346
 msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
@@ -3359,7 +3444,7 @@ msgstr ""
 "的“ISO 镜像”选项；"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:389
+#: en/SelectAndUseISOs2.xml:349
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
@@ -3368,12 +3453,12 @@ msgstr ""
 "Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:394
+#: en/SelectAndUseISOs2.xml:354
 msgid "Using Command line within a GNU/Linux system"
 msgstr "使用 GNU/Linux 系统中的命令行程序"
 
 #. type: Content of: <section><section><section><section><warning><para>
-#: en/SelectAndUseISOs2.xml:397
+#: en/SelectAndUseISOs2.xml:357
 msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
@@ -3382,17 +3467,17 @@ msgstr ""
 "据。"
 
 #. type: Content of: <section><section><section><section><para>
-#: en/SelectAndUseISOs2.xml:401
+#: en/SelectAndUseISOs2.xml:361
 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:405
+#: en/SelectAndUseISOs2.xml:365
 msgid "Open a console"
 msgstr "打开一个终端"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:409
+#: en/SelectAndUseISOs2.xml:369
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
@@ -3400,29 +3485,29 @@ msgstr ""
 "使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
-#: en/SelectAndUseISOs2.xml:413
+#: en/SelectAndUseISOs2.xml:373
 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:420
+#: en/SelectAndUseISOs2.xml:380
 msgid ""
 "Plug 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:426
+#: en/SelectAndUseISOs2.xml:386
 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:429
+#: en/SelectAndUseISOs2.xml:389
 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:434
+#: en/SelectAndUseISOs2.xml:394
 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</"
@@ -3432,7 +3517,7 @@ msgstr ""
 "以 <emphasis>sd</emphasis> 开头的设备名，如 <emphasis>sdd</emphasis>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
-#: en/SelectAndUseISOs2.xml:439
+#: en/SelectAndUseISOs2.xml:399
 #, no-wrap
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
@@ -3474,7 +3559,7 @@ 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:460
+#: en/SelectAndUseISOs2.xml:420
 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."
@@ -3483,7 +3568,7 @@ msgstr ""
 "一个 8GB 的 U 盘。"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:466
+#: en/SelectAndUseISOs2.xml:426
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
@@ -3491,12 +3576,12 @@ msgstr ""
 "输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:469
+#: en/SelectAndUseISOs2.xml:429
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "其中，“X”是您的设备名（如：/dev/sdc）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:471
+#: en/SelectAndUseISOs2.xml:431
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
 "dev/sdb bs=1M</userinput>"
@@ -3505,37 +3590,37 @@ msgstr ""
 "dev/sdb bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:477
+#: en/SelectAndUseISOs2.xml:437
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "输入命令：# <userinput>sync</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
-#: en/SelectAndUseISOs2.xml:481
+#: en/SelectAndUseISOs2.xml:441
 msgid "Unplug your USB stick, it is done"
 msgstr "操作完成，拔下 U 盘"
 
 #. type: Content of: <section><info><title>
-#: en/selectCountry.xml:13
+#: en/selectCountry.xml:3
 msgid "Select your Country / Region"
 msgstr "选择您所在的国家/地区"
 
-#.  2012-12-25 marja - moved this section out of misc-params 
-#.  2013-05-05 marja - added screenshot 
+#.  Lebarhon 2016 12 16 updated for Mageia 6
 #. type: Content of: <section><mediaobject>
-#: en/selectCountry.xml:21
+#: en/selectCountry.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.png\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
-"imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:27
+#: en/selectCountry.xml:14
+#, fuzzy
 msgid ""
-"Select your country or region. This is important for all kinds of settings, "
+"Select your country or region.  This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
 msgstr ""
@@ -3543,7 +3628,7 @@ msgstr ""
 "错误的国家，您可能无法正常使用无线网络。"
 
 #. type: Content of: <section><para>
-#: en/selectCountry.xml:32
+#: 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."
@@ -3552,7 +3637,7 @@ msgstr ""
 "国家/区域。"
 
 #. type: Content of: <section><note><para>
-#: en/selectCountry.xml:37
+#: 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 "
@@ -3563,21 +3648,20 @@ msgstr ""
 "定</guibutton> 按钮之后，请忽略前一个列表中的选项。DrakX 会应用您后来的选择。"
 
 #. type: Content of: <section><section><info><title>
-#: en/selectCountry.xml:46
+#: en/selectCountry.xml:32
 msgid "Input method"
 msgstr "输入法"
 
 #. type: Content of: <section><section><para>
-#: en/selectCountry.xml:49
+#: en/selectCountry.xml:35
+#, 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 in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method "
-"so users should not need to configure it manually. Other input methods(SCIM, "
-"GCIN, HIME, etc) also provide similar functions and can be installed if you "
-"added HTTP/FTP media before package selection."
+"default input method, so users should not need to configure it manually. "
+"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> 窗口中，您也可以选择一种输入法（位于列表底"
 "部）。输入法用于输入各类语言中的字符（中文、日文、韩文等）。IBus 是 Mageia "
@@ -3587,10 +3671,11 @@ msgstr ""
 "来安装它们。"
 
 #. type: Content of: <section><section><note><para>
-#: en/selectCountry.xml:61
+#: en/selectCountry.xml:44
+#, 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\" -&gt; "
+"after you boot your installed system via \"Configure your Computer\" -> "
 "\"System\", or by running localedrake as root."
 msgstr ""
 "若您在安装期间缺少输入法，您可以在安装完成后通过“配置我的电脑”-&gt;“系统”设置"
@@ -3896,323 +3981,383 @@ msgstr ""
 "过五键的鼠标。"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:5
+#: en/setupBootloaderAddEntry.xml:7
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "添加或修改引导菜单项"
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:10
+#. type: Content of: <section><para>
+#: en/setupBootloaderAddEntry.xml:11
 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>"
+"To do that you need to manually edit /boot/grub2/custom.cfg or use the "
+"software grub-customizer instead (Available in the Mageia repositories)."
 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><note><para>
+#: 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>"
+msgstr ""
+"有关传统引导和 UEFI 引导的内核选项，请参考：<link ns2:href=\"https://wiki."
+"mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>。"
+
+#. type: Content of: <section><info><title>
+#: en/setupBootloader.xml:9
+msgid "Bootloader main options"
+msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
-msgstr "使用 BIOS 系统"
+#: en/setupBootloader.xml:13
+#, fuzzy
+msgid "Bootloader interface"
+msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:21
+#: en/setupBootloader.xml:15
+msgid "By default, Mageia uses exclusively:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:19
 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."
+"Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
 msgstr ""
-"您可以添加项，或者修改您已选中的项，方法是在<emphasis>引导器配置</emphasis>界"
-"面按下相应键，并在弹出的编辑界面中进行操作。"
 
-#. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:26
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+#, fuzzy
+msgid "Grub2-efi for a UEFI system."
+msgstr "使用 UEFI 系统"
+
+#. type: Content of: <section><section><tip><para>
+#: en/setupBootloader.xml:29
+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"
+msgstr ""
+
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:36
+#, fuzzy
 msgid ""
-"If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
-"this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"若您选择了 <code>Grub 2</code> 作为引导器，您将无法在这里使用工具编辑引导项，"
-"请点击“下一步”继续。您需要之后手动编辑 <code>/boot/grub2/custom.cfg</code> 或"
-"使用 <code>grub-customizer</code> 来编辑。"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:33
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:42
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
+"setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
-"\"1\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:38
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:47 en/setupBootloader.xml:78
+msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
+msgstr "若您不确定如何操作，请不要修改“引导设备”。"
+
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:52
+#, fuzzy
+msgid "Grub2-efi on UEFI systems"
+msgstr "使用 UEFI 系统"
+
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:54
+#, fuzzy
 msgid ""
-"Some things that can be done without any risk, are changing the label of an "
-"entry and ticking the box to make an entry the default one."
-msgstr "部分操作，例如改变引导项标题，或设置默认选项，是没有风险的。"
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose between with or without graphical menu"
+msgstr ""
+"对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
 msgid ""
-"You can add the proper version number of an entry, or rename it completely."
-msgstr "您可以为某一项添加版本号，或者完全删除它。"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:45
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:64
+#, fuzzy
 msgid ""
-"The default entry is the one the systems boots into if you don't make a "
-"choice while booting up."
-msgstr "若您在引导时未进行选择，则会进入默认引导项对应的系统。"
+"<imageobject> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/setupBootloader.xml:69
+#, fuzzy
 msgid ""
-"Editing other things can leave you with an unbootable system.  Please don't "
-"just try something without knowing what you are doing."
-msgstr "编辑其他内容可能导致系统无法引导。请不要在不了解的情况下进行修改。"
+"If Mageia is the first system installed on your computer, the installer "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected 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 "
+"operating systems you have."
+msgstr ""
+"如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系"
+"统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 UEFI 操作系统（例如 "
+"Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 "
+"grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需"
+"求。"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
-msgid "With an UEFI system"
-msgstr "使用 UEFI 系统"
+#: en/setupBootloader.xml:84
+msgid "Using a Mageia bootloader"
+msgstr "使用 Mageia 提供的引导器"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:58
+#: en/setupBootloader.xml:86
+msgid "By default, according to your system, Mageia writes a new:"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:90
 msgid ""
-"In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
-"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
-"do here, is to choose the default entry in the drop down list."
+"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:95
+msgid "Grub2-efi bootloader into the ESP"
 msgstr ""
-"这种情况下，您将使用 Grub2-efi 进行引导，并且无法在这里使用工具进行编辑。您需"
-"要在安装后手动修改 <code>/boot/grub2/custom.cfg</code>，或使用 <code>grub-"
-"customizer</code> 来进行编辑。此处您只能选择默认引导项。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:64
+#: en/setupBootloader.xml:99
 msgid ""
-"After a click on the <guibutton>Next</guibutton> button, another drop down "
-"list allows to choose the video resolution for Grub2 which is a graphical "
-"boot loader."
+"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>"
 msgstr ""
-"在点击 <guibutton>下一步</guibutton> 按钮之后，您将会看到另一个下拉列表，可以"
-"用它来选择 GRUB2 引导器的屏幕分辨率。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:69
+#: en/setupBootloader.xml:105
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><info><title>
-#: en/setupBootloader.xml:7
-msgid "Bootloader main options"
-msgstr "引导程序的主要选项"
-
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
-"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
-"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
-"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
-"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:118
+msgid "Using an existing bootloader"
+msgstr "使用现存的引导器"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:22
+#: en/setupBootloader.xml:120
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by "
-"the installer, you can change them here."
-msgstr "若您希望修改安装程序默认选择的引导器设置，可以在这里进行更改。"
+"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."
+msgstr ""
+"有关添加 Mageia 系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计"
+"到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档"
+"以便进一步操作。"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:128
+msgid "Using the chain loading"
+msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:130
 msgid ""
-"You may already have another operating system on your machine, in which case "
-"you need to decide whether to add Mageia to your existing bootloader, or "
-"allow Mageia to create a new one."
+"If you don't want a bootable Mageia, but 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>."
 msgstr ""
-"您可能同时在电脑上安装了其他系统，这种情况下您需要将 Mageia 添加到现存引导"
-"器，或让 Mageia 创建一个新的起动器。"
-
-#. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:32
-msgid "The Mageia graphical menus are nice :"
-msgstr "Mageia 的图形化菜单："
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:37
-msgid "Using a Mageia bootloader"
-msgstr "使用 Mageia 提供的引导器"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:136
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
+#, fuzzy
 msgid ""
-"By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
-"(Master Boot Record)  of your first hard drive. If you already have other "
-"operating systems installed, Mageia attempts to add them to your new Mageia "
-"boot menu."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.png\"/> </"
+"imageobject>"
 msgstr ""
-"默认情况下将新的 GRUB（传统版）引导器写入到第一硬盘驱动器的 MBR（主引导记录）"
-"中。如果您已经安装了其他系统，Mageia 会尝试将其添加到新的引导菜单中。"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:47
+#. type: Content of: <section><section><para>
+#: en/setupBootloader.xml:147
 msgid ""
-"Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
-"legacy and Lilo."
-msgstr "除了 GRUB 传统版和 Lilo，Mageia 目前也提供 GRUB2 作为可选的引导器，"
+"You will get a warning that the bootloader will lack, ignore it by a click "
+"on <guibutton>OK</guibutton>."
+msgstr ""
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
+#, fuzzy
 msgid ""
-"Linux systems which use the GRUB2 bootloader are not currently supported by "
-"GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
-"used."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><section><title>
+#: en/setupBootloader.xml:158
+msgid "Options"
 msgstr ""
-"当前，GRUB（传统版，默认选项）无法识别和支持使用 GRUB2 作为引导器的 Linux 系"
-"统。"
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:56
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:161
+msgid "First page"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:165
 msgid ""
-"The best solution here is to use the GRUB2 bootloader which is available at "
-"the Summary page during installation."
+"<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."
 msgstr ""
-"最好的解决方法是使用 GRUB 2 引导器，可以在安装过程中的摘要页面中选择安装。"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:64
-msgid "Using an existing bootloader"
-msgstr "使用现存的引导器"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:171
+msgid ""
+"<guilabel>Security</guilabel>: This allows you to set a password for the "
+"bootloader. This means other people can not enter single user mode or change "
+"settings at the boot time."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:68
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:177
 msgid ""
-"If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader "
-"<guibutton>Configure</guibutton> button, which will allow you to change the "
-"bootloader install location."
+"<guilabel>Password</guilabel>: This text box is where you actually put the "
+"password"
 msgstr ""
-"若您要使用现存的引导器，请记得在安装过程中的摘要页面处停留，然后点击引导器 "
-"<guibutton>配置</guibutton> 按钮，并改变引导器的安装位置。"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:182
+#, fuzzy
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
-"You must select the root partition that you chose during the partitioning "
-"phase earlier, e.g. sda7."
+"<guilabel>Password (again)</guilabel>: Retype the password and Drakx will "
+"check that it matches with the one set above."
 msgstr ""
-"请不要选择类似“sda”的设备，否则会覆盖现存的 MBR。您必须选择根分区（在之前的分"
-"区操作中设置）作为安装对象"
+"<guilabel>密码（重复）</guilabel>：再输入依次用户密码。drakx 将会检查两次输入"
+"的密码是否一致。"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:79
-msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "要清楚，sda 代表一个设备（磁盘），sda7 代表设备上的分区。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:188 en/setupBootloader.xml:245
+#, fuzzy
+msgid "<guilabel>Advanced</guilabel>"
+msgstr "<guilabel>服务</guilabel>:"
 
-#. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:83
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:192
 msgid ""
-"Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
-"the installer screen."
+"<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. Uncheck it be "
+"useful, for example, if 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 ""
-"可以按下 Ctrl+Alt+F2 来转到 tty2，然后输入 <literal>df</literal> 来查看 "
-"<literal>/</literal>（根分区）对应的分区编号。然后按下 Ctrl+Alt+F7 返回安装界"
-"面。"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:89
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:202
 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."
+"<guilabel>Enable SMP</guilabel>: This option enables / disables symmetric "
+"multiprocessing for multi core processors."
 msgstr ""
-"有关添加 Mageia 系统至现存引导器的问题超出了此帮助的范围。多数情况下，这设计"
-"到运行相应的引导器安装程序，并自动检测和添加引导项。请参见有关操作系统的文档"
-"以便进一步操作。"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:99
-msgid "Bootloader advanced option"
-msgstr "引导器高级选项"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:208
+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."
+msgstr ""
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:103
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:216
 msgid ""
-"If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
-"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
-"guilabel>. This helps to maintain some free space."
+"<guilabel>Enable Local APIC</guilabel>: Here you can set local APIC, which "
+"manage all external interrupts for some specific processor in an SMP system."
 msgstr ""
-"如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小，请点"
-"击 <guibutton>Advanced</guibutton>，然后勾选 <guilabel>每次启动时清理 /tmp</"
-"guilabel>。这有助于维持一定的空闲空间。"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:114
+#. type: Content of: <section><section><section><title>
+#: en/setupBootloader.xml:226
+msgid "Next page"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:230
+msgid "<guilabel>Default:</guilabel> Operating system started up by default"
+msgstr ""
+
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:235
 msgid ""
-"With an UEFI system, the user interface is slightly different as you cannot "
-"choose the boot loader since only Grub2-efi is available."
+"<guilabel>Append:</guilabel> This option lets you pass the kernel "
+"information or tell the kernel to give you more information as it boots."
 msgstr ""
-"对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
 
-#. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:118
+#. type: Content of: <section><section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:241
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+"<guilabel>Probe foreign OS</guilabel>: see above <link linkend="
+"\"setupMageiaBootloader\">Using a Mageia bootloader</link>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:126
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:247
 msgid ""
-"If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
-"If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing "
-"ESP created by Windows and added grub2-efi. Although it is possible to have "
-"several ESPs, only one is advised and enough whatever the number of "
-"operating systems you have."
+"<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."
 msgstr ""
-"如果 Mageia 是您在电脑上安装的第一个系统，安装程序将自动创建一个 ESP（EFI 系"
-"统分区）来容纳引导器（Grub2-efi）。如果已安装了其他 UEFI 操作系统（例如 "
-"Windows 8），Mageia 安装器将会探测现存的（由 Windows 创建的） ESP，并添加 "
-"grub2-efi。尽管多个 ESP 可以共存，但只需一个 ESP 即可满足启动所有操作系统的需"
-"求。"
 
-#. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:134
-msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
-msgstr "若您不确定如何操作，请不要修改“引导设备”。"
+#. type: Content of: <section><section><section><itemizedlist><listitem><para><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:254
+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
@@ -4259,22 +4404,23 @@ msgid "DrakX should then be able to configure the drive(s) correctly."
 msgstr "随后 DrakX 应当能正确配置这些驱动器。"
 
 #. type: Content of: <section><info><title>
-#: en/soundConfig.xml:11
+#: en/soundConfig.xml:3
 msgid "Sound Configuration"
 msgstr "声音配置"
 
-#.  Started by marja on 2013-12-07 
+#.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/soundConfig.xml:17
+#: en/soundConfig.xml:9
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
-"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:23
+#: 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 "
@@ -4283,7 +4429,7 @@ msgstr ""
 "这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:27
+#: en/soundConfig.xml:18
 msgid ""
 "The default driver should work without problems. However, if after install "
 "you do encounter problems, then run <command>draksound</command> or start "
@@ -4296,7 +4442,7 @@ msgstr ""
 "guilabel>选项卡中的<guilabel>声音配置</guilabel>来启动 draksound。"
 
 #. type: Content of: <section><para>
-#: en/soundConfig.xml:33
+#: en/soundConfig.xml:24
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
 "<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
@@ -4306,12 +4452,12 @@ msgstr ""
 "<guibutton>故障排除</guibutton>来查看解决问题的建议。"
 
 #. type: Content of: <section><section><info><title>
-#: en/soundConfig.xml:41
+#: en/soundConfig.xml:31
 msgid "Advanced"
 msgstr "高级"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:44
+#: en/soundConfig.xml:34
 msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
@@ -4321,7 +4467,7 @@ msgstr ""
 "<guibutton>Advanced</guibutton>来更正。"
 
 #. type: Content of: <section><section><para>
-#: en/soundConfig.xml:49
+#: en/soundConfig.xml:39
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
@@ -4485,12 +4631,12 @@ msgid "Uninstalling Mageia"
 msgstr "卸载Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:9
+#: en/uninstall-Mageia.xml:10
 msgid "Howto"
 msgstr "如何做"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:11
+#: en/uninstall-Mageia.xml:12
 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 "
@@ -4500,7 +4646,7 @@ msgstr ""
 "一功能可不是所有操作系统都会提供的！"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:17
 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 "
@@ -4511,7 +4657,7 @@ msgstr ""
 "Windows 系统。"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:20
+#: en/uninstall-Mageia.xml:22
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
 "<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
@@ -4528,7 +4674,7 @@ msgstr ""
 "空间。"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:28
+#: en/uninstall-Mageia.xml:30
 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."
@@ -4537,7 +4683,7 @@ msgstr ""
 "NTFS），系统将自动为其分配一个盘符。"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:31
+#: en/uninstall-Mageia.xml:33
 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 "
@@ -4593,6 +4739,278 @@ msgstr ""
 "间，这是正常现象。"
 
 #~ msgid ""
+#~ "However, while using your new install, any user you add in <emphasis>MCC "
+#~ "- System - Manage users on system</emphasis> will have a home directory "
+#~ "that is both read and write protected."
+#~ msgstr ""
+#~ "不过，在使用系统时，通过 <emphasis>Mageia 控制中心 - 系统 -管理系统用户</"
+#~ "emphasis>添加的用户将拥有其他用户不可读且不可写的主目录。"
+
+#~ msgid ""
+#~ "If you don't want a world readable home directory for anyone, it is "
+#~ "advised to only add a temporary user now and to add the real one(s)  "
+#~ "after reboot."
+#~ msgstr ""
+#~ "若您不希望为任何人创建全局可读的主目录，则现在最好只添加一个临时用户，然后"
+#~ "在重启后添加您所需要的用户。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks."
+#~ "png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+#~ "\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
+#~ "format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+
+#~ msgid "DVD dual arch"
+#~ msgstr "DVD 双架构"
+
+#~ msgid ""
+#~ "Both architectures are present on the same medium, the choice is made "
+#~ "automatically according to the detected CPU."
+#~ msgstr "同一媒介中包含两种架构。程序将根据检测到的 CPU 类型自动做出选择。"
+
+#~ msgid "Uses Xfce desktop only."
+#~ msgstr "仅使用 Xfce 桌面。"
+
+#~ msgid ""
+#~ "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
+#~ "pt, ru, sv, uk) TO BE CHECKED!"
+#~ msgstr ""
+#~ "并非所有语言都有完整支持。（be, bg, ca, de, en, es, fr, it, mk, pl, pt, "
+#~ "ru, sv, uk）请认真核对！"
+
+#~ msgid "It contains non free software."
+#~ msgstr "其中包含非自由软件。"
+
+#~ msgid "Live CD KDE"
+#~ msgstr "Live CD KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "仅使用 32 位架构。"
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Live CD GNOME"
+
+#~ msgid "boot.iso"
+#~ msgstr "boot.iso"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+#~ "align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
+#~ "</imageobject>"
+#~ 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>"
+
+#~ msgid "With a Bios system"
+#~ msgstr "使用 BIOS 系统"
+
+#~ 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."
+#~ msgstr ""
+#~ "您可以添加项，或者修改您已选中的项，方法是在<emphasis>引导器配置</"
+#~ "emphasis>界面按下相应键，并在弹出的编辑界面中进行操作。"
+
+#~ msgid ""
+#~ "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
+#~ "this tool to edit entries at this step, press 'Next'. You need to "
+#~ "manually edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-"
+#~ "customizer</code> instead."
+#~ msgstr ""
+#~ "若您选择了 <code>Grub 2</code> 作为引导器，您将无法在这里使用工具编辑引导"
+#~ "项，请点击“下一步”继续。您需要之后手动编辑 <code>/boot/grub2/custom.cfg</"
+#~ "code> 或使用 <code>grub-customizer</code> 来编辑。"
+
+#~ msgid ""
+#~ "Some things that can be done without any risk, are changing the label of "
+#~ "an entry and ticking the box to make an entry the default one."
+#~ msgstr "部分操作，例如改变引导项标题，或设置默认选项，是没有风险的。"
+
+#~ msgid ""
+#~ "You can add the proper version number of an entry, or rename it "
+#~ "completely."
+#~ msgstr "您可以为某一项添加版本号，或者完全删除它。"
+
+#~ msgid ""
+#~ "The default entry is the one the systems boots into if you don't make a "
+#~ "choice while booting up."
+#~ msgstr "若您在引导时未进行选择，则会进入默认引导项对应的系统。"
+
+#~ msgid ""
+#~ "Editing other things can leave you with an unbootable system.  Please "
+#~ "don't just try something without knowing what you are doing."
+#~ msgstr "编辑其他内容可能导致系统无法引导。请不要在不了解的情况下进行修改。"
+
+#~ msgid ""
+#~ "In this case you are using Grub2-efi and you cannot use this tool to edit "
+#~ "entries at this step. To do that you need to manually edit <code>/boot/"
+#~ "grub2/custom.cfg</code> or use <code>grub-customizer</code> instead. All "
+#~ "you can do here, is to choose the default entry in the drop down list."
+#~ msgstr ""
+#~ "这种情况下，您将使用 Grub2-efi 进行引导，并且无法在这里使用工具进行编辑。"
+#~ "您需要在安装后手动修改 <code>/boot/grub2/custom.cfg</code>，或使用 "
+#~ "<code>grub-customizer</code> 来进行编辑。此处您只能选择默认引导项。"
+
+#~ msgid ""
+#~ "After a click on the <guibutton>Next</guibutton> button, another drop "
+#~ "down list allows to choose the video resolution for Grub2 which is a "
+#~ "graphical boot loader."
+#~ msgstr ""
+#~ "在点击 <guibutton>下一步</guibutton> 按钮之后，您将会看到另一个下拉列表，"
+#~ "可以用它来选择 GRUB2 引导器的屏幕分辨率。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+#~ "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+#~ "revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" "
+#~ "revision=\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
+
+#~ msgid ""
+#~ "If you prefer different bootloader settings to those chosen automatically "
+#~ "by the installer, you can change them here."
+#~ msgstr "若您希望修改安装程序默认选择的引导器设置，可以在这里进行更改。"
+
+#~ msgid ""
+#~ "You may already have another operating system on your machine, in which "
+#~ "case you need to decide whether to add Mageia to your existing "
+#~ "bootloader, or allow Mageia to create a new one."
+#~ msgstr ""
+#~ "您可能同时在电脑上安装了其他系统，这种情况下您需要将 Mageia 添加到现存引导"
+#~ "器，或让 Mageia 创建一个新的起动器。"
+
+#~ msgid ""
+#~ "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
+#~ "(Master Boot Record)  of your first hard drive. If you already have other "
+#~ "operating systems installed, Mageia attempts to add them to your new "
+#~ "Mageia boot menu."
+#~ msgstr ""
+#~ "默认情况下将新的 GRUB（传统版）引导器写入到第一硬盘驱动器的 MBR（主引导记"
+#~ "录）中。如果您已经安装了其他系统，Mageia 会尝试将其添加到新的引导菜单中。"
+
+#~ msgid ""
+#~ "Mageia now also offers GRUB2 as an optional bootloader in addition to "
+#~ "GRUB legacy and Lilo."
+#~ msgstr "除了 GRUB 传统版和 Lilo，Mageia 目前也提供 GRUB2 作为可选的引导器，"
+
+#~ msgid ""
+#~ "Linux systems which use the GRUB2 bootloader are not currently supported "
+#~ "by GRUB (legacy)  and will not be recognized if the default GRUB "
+#~ "bootloader is used."
+#~ msgstr ""
+#~ "当前，GRUB（传统版，默认选项）无法识别和支持使用 GRUB2 作为引导器的 Linux "
+#~ "系统。"
+
+#~ msgid ""
+#~ "The best solution here is to use the GRUB2 bootloader which is available "
+#~ "at the Summary page during installation."
+#~ msgstr ""
+#~ "最好的解决方法是使用 GRUB 2 引导器，可以在安装过程中的摘要页面中选择安装。"
+
+#~ msgid ""
+#~ "If you decide to use an existing bootloader then you will need to "
+#~ "remember to STOP at the summary page during the installation and click "
+#~ "the Bootloader <guibutton>Configure</guibutton> button, which will allow "
+#~ "you to change the bootloader install location."
+#~ msgstr ""
+#~ "若您要使用现存的引导器，请记得在安装过程中的摘要页面处停留，然后点击引导"
+#~ "器 <guibutton>配置</guibutton> 按钮，并改变引导器的安装位置。"
+
+#~ msgid ""
+#~ "Do not select a device e.g.\"sda\", or you will overwrite your existing "
+#~ "MBR. You must select the root partition that you chose during the "
+#~ "partitioning phase earlier, e.g. sda7."
+#~ msgstr ""
+#~ "请不要选择类似“sda”的设备，否则会覆盖现存的 MBR。您必须选择根分区（在之前"
+#~ "的分区操作中设置）作为安装对象"
+
+#~ msgid "To be clear, sda is a device, sda7 is a partition on that device."
+#~ msgstr "要清楚，sda 代表一个设备（磁盘），sda7 代表设备上的分区。"
+
+#~ msgid ""
+#~ "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
+#~ "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back "
+#~ "to the installer screen."
+#~ msgstr ""
+#~ "可以按下 Ctrl+Alt+F2 来转到 tty2，然后输入 <literal>df</literal> 来查看 "
+#~ "<literal>/</literal>（根分区）对应的分区编号。然后按下 Ctrl+Alt+F7 返回安"
+#~ "装界面。"
+
+#~ msgid "Bootloader advanced option"
+#~ msgstr "引导器高级选项"
+
+#~ msgid ""
+#~ "If you have very limited disk space for the <literal>/</literal> "
+#~ "partition that contains <literal>/tmp</literal>, click on "
+#~ "<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /"
+#~ "tmp at each boot</guilabel>. This helps to maintain some free space."
+#~ msgstr ""
+#~ "如果您的 <literal>/</literal> 分区对于 <literal>/tmp</literal> 来说太小，"
+#~ "请点击 <guibutton>Advanced</guibutton>，然后勾选 <guilabel>每次启动时清"
+#~ "理 /tmp</guilabel>。这有助于维持一定的空闲空间。"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -4609,10 +5027,3 @@ msgstr ""
 #~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
 #~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 #~ "imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-#~ "imageobject>"