Sync with Calenco

author: Yuri Chornoivan <yurchor@ukr.net> 2017-02-10 18:39:25 +0200
committer: Yuri Chornoivan <yurchor@ukr.net> 2017-02-10 18:39:25 +0200
commit: b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46 (patch)
tree: cce0e9fff47b08681efd9cfdc2bcd102ee87e953
parent: dd8d5e60b84580f8adde578f1c82fed86725932a (diff)
download: tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar
tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar.gz
tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar.bz2
tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar.xz
tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.zip
16 files changed, 2324 insertions, 1850 deletions
diff --git a/docs/installer/en/SelectAndUseISOs2.xml b/docs/installer/en/SelectAndUseISOs2.xml
index 12a8c2e6..dca3b62f 100644
--- a/docs/installer/en/SelectAndUseISOs2.xml
+++ b/docs/installer/en/SelectAndUseISOs2.xml
@@ -1,5 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" xml:id="Select-and-use-ISOs" version="5.0">
-  <!-- Made by Lebarhon 2014 03 26 -->
+<?xml version='1.0' encoding='UTF-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="Select-and-use-ISOs">
+  <!-- Made by Lebarhon 2014 03 26 
+
+Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
 
   <info>
     <title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
@@ -89,30 +91,6 @@
           </listitem>
         </itemizedlist>
       </section>
-
-      <section>
-        <title>DVD dual arch</title>
-
-        <itemizedlist>
-          <listitem>
-            <para>Both architectures are present on the same medium, the
-            choice is made automatically according to the detected CPU.</para>
-          </listitem>
-
-          <listitem>
-            <para>Uses Xfce desktop only.</para>
-          </listitem>
-
-          <listitem>
-            <para>Not all languages are available. (be, bg, ca, de, en, es,
-            fr, it, mk, pl, pt, ru, sv, uk) TO BE CHECKED!</para>
-          </listitem>
-
-          <listitem>
-            <para>It contains non free software.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
     </section>
 
     <section>
@@ -128,8 +106,8 @@
           </listitem>
 
           <listitem>
-            <para>Each ISO contains only one desktop environment (KDE or
-            GNOME).</para>
+            <para>Each ISO contains only one desktop environment (KDE, GNOME
+            or Xfce).</para>
           </listitem>
 
           <listitem>
@@ -149,25 +127,25 @@
       </section>
 
       <section>
-        <title>Live CD KDE</title>
+        <title>Live DVD Plasma</title>
 
         <itemizedlist>
           <listitem>
-            <para>KDE desktop environment only.</para>
+            <para>Plasma desktop environment only.</para>
           </listitem>
 
           <listitem>
-            <para>English language only.</para>
+            <para>All languages are present.</para>
           </listitem>
 
           <listitem>
-            <para>32 bit only.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
 
       <section>
-        <title>Live CD GNOME</title>
+        <title>Live DVD GNOME</title>
 
         <itemizedlist>
           <listitem>
@@ -175,24 +153,6 @@
           </listitem>
 
           <listitem>
-            <para>English language only.</para>
-          </listitem>
-
-          <listitem>
-            <para>32 bit only.</para>
-          </listitem>
-        </itemizedlist>
-      </section>
-
-      <section>
-        <title>Live DVD KDE</title>
-
-        <itemizedlist>
-          <listitem>
-            <para>KDE desktop environment only.</para>
-          </listitem>
-
-          <listitem>
             <para>All languages are present.</para>
           </listitem>
 
@@ -203,11 +163,11 @@
       </section>
 
       <section>
-        <title>Live DVD GNOME</title>
+        <title>Live DVD Xfce</title>
 
         <itemizedlist>
           <listitem>
-            <para>GNOME desktop environment only.</para>
+            <para>Xfce desktop environment only.</para>
           </listitem>
 
           <listitem>
@@ -255,7 +215,7 @@
       </section>
 
       <section>
-        <title>boot.iso</title>
+        <title>netinstall.iso</title>
 
         <itemizedlist>
           <listitem>
@@ -266,7 +226,7 @@
       </section>
 
       <section>
-        <title>boot-nonfree.iso</title>
+        <title>netinstall-nonfree.iso</title>
 
         <itemizedlist>
           <listitem>
diff --git a/docs/installer/en/addUser.xml b/docs/installer/en/addUser.xml
index 7676bdc2..680847ba 100644
--- a/docs/installer/en/addUser.xml
+++ b/docs/installer/en/addUser.xml
@@ -1,32 +1,13 @@
-<?xml version='1.0' encoding='UTF-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" xml:id="addUser" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="addUser">
   <info>
     <title xml:id="addUser-ti1">User and Superuser Management</title>
   </info>
 
-  <!-- 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)-->
 
   <mediaobject>
     <imageobject condition="classical">
-      <imagedata revision="1" align="center" xml:id="setRootPassword-im1" fileref="dx2-setRootPassword.png" format="PNG"/>
+      <imagedata format="PNG" fileref="dx2-setRootPassword.png" align="center" revision="1" xml:id="setRootPassword-im1"/>
     </imageobject>
 
     <imageobject>
@@ -96,20 +77,11 @@
     </itemizedlist>
 
     <note>
-      <para>Any user you add while installing Mageia, will have a world
-      readable (but write protected) home directory.</para>
-
-      <para>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.</para>
-
-      <para>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.</para>
+      <para>Any user you add while installing Mageia, will have a both read
+      and write protected home directory (umask=0027).</para>
 
-      <para>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
+      <para>You can add all extra needed users in the <emphasis>Configuration
+      - Summary</emphasis> step during the install. Choose <emphasis>User
       management</emphasis>.</para>
 
       <para>The access permissions can also be changed after the
@@ -117,7 +89,7 @@
     </note>
   </section>
 
-  <section condition="classical" xml:id="addUserAdvanced">
+  <section xml:id="addUserAdvanced" condition="classical">
     <info>
       <title xml:id="addUserAdvanced-ti3">Advanced User Management</title>
     </info>
diff --git a/docs/installer/en/chooseDesktop.xml b/docs/installer/en/chooseDesktop.xml
index 792a8a92..50edc24d 100644
--- a/docs/installer/en/chooseDesktop.xml
+++ b/docs/installer/en/chooseDesktop.xml
@@ -1,35 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="chooseDesktop">
-
-
-    <info>
-      <title xml:id="chooseDesktop-ti1">Desktop Selection</title>
-    </info>
-
- <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-
-
-    <para>Depending on your selection here, you may be offered further screens to fine tune your choice.</para>
-
-    <para>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</para>
-
-
-
-<mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-chooseDesktop.png" align="center" format="PNG" 
-         ></imagedata>
-      </imageobject>
-    </mediaobject>
-
-    <para>Choose whether you prefer to use the <application>KDE</application>
-    or <application>Gnome</application> desktop environment. Both come with a
-    full set of useful applications and tools. Tick
-    <guilabel>Custom</guilabel> if you want to use neither or both, or if you
-    want something other than the default software choices for these desktop
-    environments. The <application>LXDE</application> desktop is lighter than
-    the previous two, sporting less eye candy and fewer packages installed by
-    default.</para>
-  </section>
-
+<?xml version='1.0' encoding='UTF-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="chooseDesktop">
+  <info>
+    <title xml:id="chooseDesktop-ti1">Desktop Selection</title>
+  </info>
+
+  <!--Lebarhon 20170209 updated SC-->
+
+  <para>Depending on your selection here, you may be offered further screens
+  to fine tune your choice.</para>
+
+  <para>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</para>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata format="PNG" fileref="dx2-chooseDesktop.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>Choose whether you prefer to use the <application>KDE</application> or
+  <application>Gnome</application> desktop environment. Both come with a full
+  set of useful applications and tools. Tick <guilabel>Custom</guilabel> if
+  you want to use neither or both, or if you want something other than the
+  default software choices for these desktop environments. The
+  <application>LXDE</application> desktop is lighter than the previous two,
+  sporting less eye candy and fewer packages installed by default.</para>
+</section>
+\ No newline at end of file
diff --git a/docs/installer/en/choosePackageGroups.xml b/docs/installer/en/choosePackageGroups.xml
index 7e50d6ae..65838436 100644
--- a/docs/installer/en/choosePackageGroups.xml
+++ b/docs/installer/en/choosePackageGroups.xml
@@ -1,42 +1,40 @@
-<?xml version="1.0" encoding="UTF-8"?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="choosePackageGroups">
-
-    <info>
-      <title xml:id="choosePackageGroups-ti1">Package Group Selection</title>
-    </info>
-
-    <!--2012-12-26 marja - exported this section from choosePackages.xml to start a new page-->
-
-<mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-choosePackageGroups.png" align="center" format="PNG" 
-         ></imagedata>
-      </imageobject>
-    </mediaobject>
-
-    <para>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.</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>Workstation.</para>
-      </listitem>
-
-      <listitem>
-        <para>Server.</para>
-      </listitem>
-
-      <listitem>
-        <para>Graphical Environment.</para>
-      </listitem>
-
-      <listitem>
-        <para>Individual Package Selection: You can use this option to
-        manually add or remove packages.</para>
-      </listitem>
-    </itemizedlist>
-    <para>Read  <xref linkend="minimal-install"></xref> for instructions on
-    how to do a minimal install (without or with X &amp; IceWM).</para> 
-  </section>
-
+<?xml version='1.0' encoding='UTF-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="choosePackageGroups">
+  <info>
+    <title xml:id="choosePackageGroups-ti1">Package Group Selection</title>
+  </info>
+
+  <!--Lebarhon 20170209 Updated SC-->
+
+  <mediaobject>
+    <imageobject>
+      <imagedata format="PNG" fileref="dx2-choosePackageGroups.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <para>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.</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>Workstation.</para>
+    </listitem>
+
+    <listitem>
+      <para>Server.</para>
+    </listitem>
+
+    <listitem>
+      <para>Graphical Environment.</para>
+    </listitem>
+
+    <listitem>
+      <para>Individual Package Selection: You can use this option to manually
+      add or remove packages.</para>
+    </listitem>
+  </itemizedlist>
+
+  <para>Read <xref linkend="minimal-install"/> for instructions on how to do a
+  minimal install (without or with X &amp; IceWM).</para>
+</section>
+\ No newline at end of file
diff --git a/docs/installer/en/diskdrake.xml b/docs/installer/en/diskdrake.xml
index 0affba06..a4eb1a53 100644
--- a/docs/installer/en/diskdrake.xml
+++ b/docs/installer/en/diskdrake.xml
@@ -1,20 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="diskdrake">
-  <!-- Started by marja on 2012 03 29 -->
+  <!-- Lebarhon 2016 12 16 updated for Mageia 6
 
-  <!-- NEEDS TO BE WRITTEN AND THEN REVIEWED! -->
-
-  <!-- JohnR added note for bug 133 re encrypted partitions -->
-
-  <!-- JohnR 2012-04-10 - tidy up module formatting -->
-
-  <!-- Marja, 2012-04-18 changed "If you wish to use encryption on
-    any of your partitions" into "If you wish to use encryption on
-      your <literal>/</literal> partition" because pterjan said this is only for root 
-      Also added some text. -->
-
-  <!--marja 20120418 moved section end tag down to where it belongs-->
-
-  <!--marja 20120418 added para 6a-->
+Lebarhon 20170902 added SC-->
 
   <info>
     <title xml:id="diskdrake-ti1">Custom disk partitioning with
@@ -22,10 +9,11 @@
   </info>
 
   <mediaobject>
-    <imageobject condition='classical'>
+    <imageobject condition="classical">
       <imagedata fileref="dx2-diskdrake.png" align="center"/>
     </imageobject>
-    <imageobject condition='live' >
+
+    <imageobject condition="live">
       <imagedata fileref="live-diskdrake.png" align="center"/>
     </imageobject>
   </mediaobject>
@@ -38,37 +26,56 @@
     will be unbootable.</para>
   </warning>
 
-  <para revision="2" xml:id="diskdrake-pa3">Adjust the layout of your disk(s)
+  <para xml:id="diskdrake-pa3" revision="2">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.</para>
 
-  <para revision="1" xml:id="diskdrake-pa4">There is a tab for every detected
+  <para xml:id="diskdrake-pa4" revision="1">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.</para>
 
-  <para revision="1" xml:id="diskdrake-pa5">Push <guibutton>Clear
+  <para xml:id="diskdrake-pa5" revision="1">Push <guibutton>Clear
   all</guibutton> to wipe all partitions on the selected storage device</para>
 
-  <para revision="1" xml:id="diskdrake-pa6">For all other actions: click on
+  <para xml:id="diskdrake-pa6" revision="1">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.</para>
 
   <para xml:id="diskdrake-pa6a" revision="1">Continue until you adjusted
   everything to your wishes.</para>
 
-  <para revision="1" xml:id="diskdrake-pa7">Click <guibutton>Done</guibutton>
+  <para xml:id="diskdrake-pa7" revision="1">Click <guibutton>Done</guibutton>
   when you're ready.</para>
 
   <note>
     <para>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)</para>
+    below)</para>
 
     <para><mediaobject>
         <imageobject>
           <imagedata fileref="dx2-diskdrake2.png"/>
         </imageobject>
+      </mediaobject><mediaobject>
+        <imageobject>
+          <imagedata fileref="live-diskdrake2.png"/>
+        </imageobject>
       </mediaobject></para>
   </note>
+
+  <note>
+    <para>If you are installing Mageia on a Legacy/GPT system, check that a
+    BIOS boot partition is present with a correct type</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-doPartitionDisks3.png"/>
+      </imageobject>
+
+      <imageobject>
+        <imagedata fileref="live-doPartitionDisks3.png"/>
+      </imageobject>
+    </mediaobject>
+  </note>
 </section>
 \ No newline at end of file
diff --git a/docs/installer/en/doPartitionDisks.xml b/docs/installer/en/doPartitionDisks.xml
index e583d579..aead94ea 100644
--- a/docs/installer/en/doPartitionDisks.xml
+++ b/docs/installer/en/doPartitionDisks.xml
@@ -1,24 +1,32 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="doPartitionDisks">
   <!---->
 
-  <!-- lebarhon 2015-07-03 Suggested updates for Mageia 5 -->
+  <!-- lebarhon 20161216 updated for Mageia 6
+
+lebarhon 20170209 added SC-->
 
   <info>
     <title xml:id="doPartitionDisks-ti1">Partitioning</title>
   </info>
 
-  <para revision="1" xml:id="doPartitionDisks-pa1">In this screen you can see
+  <para xml:id="doPartitionDisks-pa1" revision="1">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>.</para>
 
-  <para revision="1" xml:id="doPartitionDisks-pa2">The options available from
+  <para xml:id="doPartitionDisks-pa2" revision="1">The options available from
   the list below will vary depending on your particular hard drive(s) layout
   and content.</para>
 
   <mediaobject>
     <imageobject>
-      <imagedata align="center" fileref="dx2-doPartitionDisks.png"/>
+      <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
+    </imageobject>
+  </mediaobject>
+
+  <mediaobject>
+    <imageobject>
+      <imagedata fileref="live-doPartitionDisks.png"/>
     </imageobject>
   </mediaobject>
 
@@ -27,24 +35,24 @@
         <para revision="1" xml:id="doPartitionDisks-pa4">Use Existing
         Partitions</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa5">If this option is
+        <para xml:id="doPartitionDisks-pa5" revision="1">If this option is
         available, then existing Linux compatible partitions have been found
         and may be used for the installation.</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa6">Use Free Space</para>
+        <para xml:id="doPartitionDisks-pa6" revision="1">Use Free Space</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa7">If you have unused
+        <para xml:id="doPartitionDisks-pa7" revision="1">If you have unused
         space on your hard drive then this option will use it for your new
         Mageia installation.</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa8">Use Free Space on a
+        <para xml:id="doPartitionDisks-pa8" revision="1">Use Free Space on a
         Windows Partition</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa9">If you have unused
+        <para xml:id="doPartitionDisks-pa9" revision="1">If you have unused
         space on an existing Windows partition, the installer may offer to use
         it.</para>
 
@@ -53,7 +61,7 @@
         operation so you should make sure you have backed up all important
         files!</para>
 
-        <para xml:id="doPartitionDisks-pa11" revision="3">Note that this
+        <para revision="3" xml:id="doPartitionDisks-pa11">Note that this
         involves shrinking the size of the Windows partition. The partition
         must be "clean", meaning that Windows must have closed down correctly
         the last time it was used. It must also have been defragmented,
@@ -72,28 +80,34 @@
             <imagedata fileref="dx2-doPartitionDisks2.png"/>
           </imageobject>
         </mediaobject>
+
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="live-doPartitionDisks2.png"/>
+          </imageobject>
+        </mediaobject>
       </listitem>
     </itemizedlist> <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa12">Erase and use Entire
+        <para xml:id="doPartitionDisks-pa12" revision="1">Erase and use Entire
         Disk.</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa13">This option will use
+        <para xml:id="doPartitionDisks-pa13" revision="1">This option will use
         the complete drive for Mageia.</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa14">Note! This will
+        <para xml:id="doPartitionDisks-pa14" revision="1">Note! This will
         erase ALL data on the selected hard drive. Take care!</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa15">If you intend to use
+        <para xml:id="doPartitionDisks-pa15" revision="1">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.</para>
       </listitem>
     </itemizedlist><itemizedlist>
       <listitem>
-        <para revision="1" xml:id="doPartitionDisks-pa16">Custom</para>
+        <para xml:id="doPartitionDisks-pa16" revision="1">Custom</para>
 
-        <para revision="1" xml:id="doPartitionDisks-pa17">This gives you
+        <para xml:id="doPartitionDisks-pa17" revision="1">This gives you
         complete control over the placing of the installation on your hard
         drive(s).</para>
       </listitem>
@@ -143,6 +157,33 @@
     check it has been correctly done</para>
   </note>
 
+  <note>
+    <para>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.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-doPartitionDisks3.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-doPartitionDisks3.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-doPartitionDisks4.png"/>
+      </imageobject>
+    </mediaobject>
+  </note>
+
   <warning>
     <para>Some newer drives are now using 4096 byte logical sectors, instead
     of the previous standard of 512 byte logical sectors. Due to lack of
diff --git a/docs/installer/en/exitInstall.xml b/docs/installer/en/exitInstall.xml
index 229aba28..7cf642d5 100644
--- a/docs/installer/en/exitInstall.xml
+++ b/docs/installer/en/exitInstall.xml
@@ -1,37 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?><section 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" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0">
-
+<?xml version='1.0' encoding='utf-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" xml:id="exitInstall" version="5.0">
   <info>
     <title xml:id="exitInstall-ti1">Congratulations</title>
   </info>
 
-  <!-- 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"-->
-  
-   <mediaobject>
+  <!-- Lebarhon 20170209 updated SC-->
+
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-exitInstall.png"  
-       format="PNG" align="center"   xml:id="exitInstall-im1">
-      </imagedata>
+      <imagedata format="PNG" fileref="dx2-exitInstall.png" align="center" revision="1" xml:id="exitInstall-im1"/>
     </imageobject>
   </mediaobject>
 
-  <para revision="2" xml:id="exitInstall-pa1">You have finished installing
-  and configuring <application>Mageia</application> and it is now safe to 
-  remove the installation medium and reboot your computer.</para>
+  <para xml:id="exitInstall-pa1" revision="2">You have finished installing and
+  configuring <application>Mageia</application> and it is now safe to remove
+  the installation medium and reboot your computer.</para>
+
+  <para xml:id="exitInstall-pa2" revision="2">After reboot, in the bootloader
+  screen, you can choose between the operating systems on your computer (if
+  you have more than one).</para>
+
+  <para xml:id="exitInstall-pa3" revision="1">If you didn't adjust the
+  settings for the bootloader, your Mageia install will be automatically
+  selected and started.</para>
 
-  <para revision="2" xml:id="exitInstall-pa2">After reboot, in the bootloader screen,
-  you can choose between the operating systems on your computer (if you have more than one).</para>
+  <para xml:id="exitInstall-pa4" revision="1">Enjoy!</para>
 
-  <para revision="1" xml:id="exitInstall-pa3">If you didn't adjust the settings for
-   the bootloader, your Mageia install will be automatically selected and started. </para>
-  
-  <para revision="1" xml:id="exitInstall-pa4">Enjoy!</para>
-  
-  <para revision="1" xml:id="exitInstall-pa5">Visit www.mageia.org if you have any questions
-   or want to contribute to Mageia </para>
-  
-  
+  <para xml:id="exitInstall-pa5" revision="1">Visit www.mageia.org if you have
+  any questions or want to contribute to Mageia</para>
 </section>
 \ No newline at end of file
diff --git a/docs/installer/en/misc-params.xml b/docs/installer/en/misc-params.xml
index b3475c3e..bbc50975 100644
--- a/docs/installer/en/misc-params.xml
+++ b/docs/installer/en/misc-params.xml
@@ -1,45 +1,39 @@
-<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="misc-params" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="misc-params">
   <info>
     <title xml:id="misc-params-ti1">Summary of miscellaneous
     parameters</title>
   </info>
 
-  <!-- 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-->
 
   <mediaobject>
     <imageobject>
-      <imagedata fileref="dx2-summary.png"  revision="1" align="center" format="PNG" xml:id="summary-im1" />
+      <imagedata fileref="dx2-summaryTop.png"/>
     </imageobject>
   </mediaobject>
 
-  <para revision="1" xml:id="misc-params-pa1">DrakX made smart choices for the
+  <para xml:id="misc-params-pa1" revision="1">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>.</para>
 
+  <note>
+    <para>As a general rule, default settings are recommended and you can keep
+    them with 3 exceptions:<itemizedlist>
+        <listitem>
+          <para>there are known issues with a default setting</para>
+        </listitem>
+
+        <listitem>
+          <para>the default setting has already been tried and it fails</para>
+        </listitem>
+
+        <listitem>
+          <para>something else is said in the detailed sections below</para>
+        </listitem>
+      </itemizedlist></para>
+  </note>
+
   <section xml:id="misc-params-system">
     <info>
       <title xml:id="misc-params-system-ti2">System parameters</title>
@@ -55,38 +49,38 @@
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa3" revision="1"><guilabel>Country /
+        <para revision="1" xml:id="misc-params-system-pa3"><guilabel>Country /
         Region</guilabel></para>
 
-        <para revision="1" xml:id="misc-params-system-pa3a">If you are not in
+        <para xml:id="misc-params-system-pa3a" revision="1">If you are not in
         the selected country, it is very important that you correct the
         setting. See <xref linkend="selectCountry"/></para>
       </listitem>
 
       <listitem>
-        <para xml:id="misc-params-system-pa4" revision="1"><guilabel>Bootloader</guilabel></para>
+        <para revision="1" xml:id="misc-params-system-pa4"><guilabel>Bootloader</guilabel></para>
 
-        <para revision="2" xml:id="misc-params-system-pa4a">DrakX has made
+        <para xml:id="misc-params-system-pa4a" revision="2">DrakX has made
         good choices for the bootloader setting.</para>
 
-        <para revision="2" xml:id="misc-params-system-pa4b">Do not change
-        anything, unless you know how to configure Grub and/or Lilo</para>
+        <para xml:id="misc-params-system-pa4b" revision="2">Do not change
+        anything, unless you know how to configure Grub2</para>
 
-        <para revision="2" xml:id="misc-params-system-pa4c">For more
+        <para xml:id="misc-params-system-pa4c" revision="2">For more
         information, see <xref linkend="setupBootloader"/></para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa5"><guilabel>User
+        <para xml:id="misc-params-system-pa5" revision="1"><guilabel>User
         management</guilabel></para>
 
-        <para revision="2" xml:id="misc-params-system-pa5a">You can add extra
+        <para xml:id="misc-params-system-pa5a" revision="2">You can add extra
         users here. They will each get their own <literal>/home</literal>
         directories.</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-system-pa6"><guilabel>Services</guilabel>:</para>
+        <para xml:id="misc-params-system-pa6" revision="1"><guilabel>Services</guilabel>:</para>
 
         <para xml:id="misc-params-system-pa6a" revision="1">System services
         refer to those small programs which run the background (daemons). This
@@ -108,45 +102,50 @@
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-hardware-pa1"><guilabel>Keyboard</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa1" revision="1"><guilabel>Keyboard</guilabel>:</para>
 
         <para xml:id="misc-params-hardware-pa1a" revision="1">This is where
         you setup or change your keyboard layout which will depend on your
         location, language or type of keyboard.</para>
+
+        <note>
+          <para>If you notice a wrong keyboard layout and want to change it,
+          keep in mind that your passwords are going to change too.</para>
+        </note>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-hardware-pa2"><guilabel>Mouse</guilabel>:</para>
+        <para xml:id="misc-params-hardware-pa2" revision="1"><guilabel>Mouse</guilabel>:</para>
 
-        <para revision="1" xml:id="misc-params-hardware-pa2a">Here you can add
+        <para xml:id="misc-params-hardware-pa2a" revision="1">Here you can add
         or configure other pointing devices, tablets, trackballs etc.</para>
       </listitem>
 
       <listitem>
-        <para revision="1" xml:id="misc-params-hardware-pa3"><guilabel>Sound
+        <para xml:id="misc-params-hardware-pa3" revision="1"><guilabel>Sound
         card</guilabel>:</para>
 
-	<para revision="1" xml:id="misc-params-hardware-pa3a">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.</para>
+        <para xml:id="misc-params-hardware-pa3a" revision="1">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.</para>
       </listitem>
 
       <listitem>
         <para xml:id="misc-params-hardware-pa4" revision="1"><guilabel>Graphical
         interface</guilabel>:</para>
 
-        <para revision="1" xml:id="misc-params-hardware-pa4a">This section
+        <para xml:id="misc-params-hardware-pa4a" revision="1">This section
         allows you to configure your graphic card(s) and displays.</para>
 
-        <para revision="1" xml:id="misc-params-hardware-pa4b">For more
+        <para xml:id="misc-params-hardware-pa4b" revision="1">For more
         information, see <xref linkend="configureX_chooser"/>.</para>
       </listitem>
     </itemizedlist>
 
     <mediaobject>
       <imageobject>
-        <imagedata xml:id="summaryBottom-im1"  revision="1" align="center" format="PNG" fileref="dx2-summaryBottom.png" />
+        <imagedata format="PNG" xml:id="summaryBottom-im1" align="center" fileref="dx2-summaryBottom.png" revision="1"/>
       </imageobject>
     </mediaobject>
   </section>
@@ -159,7 +158,7 @@
 
     <itemizedlist>
       <listitem>
-        <para revision="1" xml:id="misc-params-network-pa1"><guilabel>Network</guilabel>:</para>
+        <para xml:id="misc-params-network-pa1" revision="1"><guilabel>Network</guilabel>:</para>
 
         <para xml:id="misc-params-network-pa2" revision="1">You can configure
         your network here, but for network cards with non-free drivers it is
@@ -182,7 +181,7 @@
         This section allows you to configure your computer to utilize a proxy
         service.</para>
 
-        <para revision="1" xml:id="misc-params-network-pa4b">You may need to
+        <para xml:id="misc-params-network-pa4b" revision="1">You may need to
         consult your systems administrator to get the parameters you need to
         enter here</para>
       </listitem>
@@ -196,33 +195,34 @@
 
     <itemizedlist>
       <listitem>
-        <para xml:id="misc-params-security-pa1" revision="1"><guilabel>Security
+        <para revision="1" xml:id="misc-params-security-pa1"><guilabel>Security
         Level</guilabel>:</para>
 
-        <para revision="1" xml:id="misc-params-security-pa1a">Here you set the
+        <para xml:id="misc-params-security-pa1a" revision="1">Here you set the
         Security level for your computer, in most cases the default setting
         (Standard) is adequate for general use.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa1b">Check the option
+        <para xml:id="misc-params-security-pa1b" revision="1">Check the option
         which best suits your usage.</para>
       </listitem>
 
       <listitem>
         <para xml:id="misc-params-security-pa2" revision="1"><guilabel>Firewall</guilabel>:</para>
 
-        <para xml:id="misc-params-security-pa2a" revision="1">A firewall is
+        <para revision="1" xml:id="misc-params-security-pa2a">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.</para>
 
-        <para revision="1" xml:id="misc-params-security-pa2b">Select the
+        <para xml:id="misc-params-security-pa2b" revision="1">Select the
         services that you wish to have access to your system. Your selections
-        will depend on what you use your computer for.</para>
+        will depend on what you use your computer for. For more information,
+        see <xref linkend="firewall"/>.</para>
 
         <warning>
-          <para revision="1" xml:id="misc-params-security-pa2c">Bear in mind
+          <para xml:id="misc-params-security-pa2c" revision="1">Bear in mind
           that allowing everything (no firewall) may be very risky.</para>
         </warning>
       </listitem>
     </itemizedlist>
   </section>
-</section>
+</section>
+\ No newline at end of file
diff --git a/docs/installer/en/reboot.xml b/docs/installer/en/reboot.xml
index 84f9412f..a0241fc5 100644
--- a/docs/installer/en/reboot.xml
+++ b/docs/installer/en/reboot.xml
@@ -1,24 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section version="5.0" xml:id="reboot" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="reboot">
   <info>
     <title xml:id="reboot-ti1">Reboot</title>
   </info>
 
-  <mediaobject condition="live">
+<!--Lebarhon 20170210 updated for Mageia6-->
+
+
+  <para>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></para>
+
+  <mediaobject>
     <imageobject>
-      <imagedata align="center" fileref="live-reboot.png" format="PNG"
-                 revision="1" xml:id="reboot-im1"/>
+      <imagedata fileref="live-reboot2.png"/>
     </imageobject>
   </mediaobject>
 
-  <para>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
+  <para>When you restart, you will see a succession of download progress bars.
+  These indicate that the software media are being downloaded (see Software
   management).</para>
-</section>
+
+  <mediaobject condition="live">
+    <imageobject>
+      <imagedata format="PNG" xml:id="reboot-im1" fileref="live-reboot.png" align="center" revision="1"/>
+    </imageobject>
+  </mediaobject>
+</section>
+\ No newline at end of file
diff --git a/docs/installer/en/selectCountry.xml b/docs/installer/en/selectCountry.xml
index 300188c3..a167abd0 100644
--- a/docs/installer/en/selectCountry.xml
+++ b/docs/installer/en/selectCountry.xml
@@ -1,68 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
- xmlns:ns5="http://www.w3.org/1998/Math/MathML"
- xmlns:ns4="http://www.w3.org/2000/svg"
- xmlns:ns3="http://www.w3.org/1999/xhtml"
- xmlns:ns2="http://www.w3.org/1999/xlink"
- xmlns:ns="http://docbook.org/ns/docbook"
- xml:id="selectCountry" version="5.0">
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="selectCountry" version="5.0">
+  <info>
+    <title xml:id="selectCountry-ti1">Select your Country / Region</title>
+  </info>
 
+  <!-- Lebarhon 2016 12 16 updated for Mageia 6-->
 
-
-    <info>
-      <title xml:id="selectCountry-ti1">Select your Country /
-      Region</title>
-    </info>
-
-    <!-- 2012-12-25 marja - moved this section out of misc-params -->
-   <!-- 2013-05-05 marja - added screenshot -->
-
-<mediaobject>
+  <mediaobject>
     <imageobject>
-      <imagedata revision="1" fileref="dx2-selectCountry.png"  align="center" format="PNG"  xml:id="selectCountry-im1"></imagedata>
+      <imagedata format="PNG" xml:id="selectCountry-im1" align="center" fileref="dx2-selectCountry.png" revision="1"/>
     </imageobject>
   </mediaobject>
 
+  <para revision="2" xml:id="selectCountry-pa1">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.</para>
 
-    <para revision="2" xml:id="selectCountry-pa1">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.</para>
-
-    <para revision="1" xml:id="selectCountry-pa2">If your country
-    isn't in the list, click the <guilabel>Other Countries</guilabel> button
-    and choose your country / region there.</para>
-
-    <note>
-      <para revision="1" xml:id="selectCountry-pa3">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.</para>
-    </note>
+  <para revision="1" xml:id="selectCountry-pa2">If your country isn't in the
+  list, click the <guilabel>Other Countries</guilabel> button and choose your
+  country / region there.</para>
 
-    <section xml:id="inputMethod">
+  <note>
+    <para revision="1" xml:id="selectCountry-pa3">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.</para>
+  </note>
 
-      <info>
-        <title xml:id="inputMethod-ti7">Input method</title>
-      </info>
+  <section xml:id="inputMethod">
+    <info>
+      <title xml:id="inputMethod-ti7">Input method</title>
+    </info>
 
-      <para revision="1" xml:id="selectCountry-pa4">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.</para>
+    <para xml:id="selectCountry-pa4" revision="1">In the <guilabel>Other
+    Countries</guilabel> screen you can also select an input method (at the
+    bottom of the list). Input methods allow users to input multilingual
+    characters (Chinese, Japanese, Korean, etc). IBus is the default input
+    method, so users should not need to configure it manually. Other input
+    methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be
+    installed if you added HTTP/FTP media before package selection.</para>
 
-      <note>
-        <para revision="1" xml:id="selectCountry-pa5">If you missed
-        the input method setup during installation, you can access it after
-        you boot your installed system via "Configure your Computer" -&gt;
-        "System", or by running localedrake as root.</para>
-      </note>
-    </section>
+    <note>
+      <para xml:id="selectCountry-pa5" revision="1">If you missed the input
+      method setup during installation, you can access it after you boot your
+      installed system via "Configure your Computer" -> "System", or by
+      running localedrake as root.</para>
+    </note>
   </section>
-
+</section>
+\ No newline at end of file
diff --git a/docs/installer/en/setupBootloader.xml b/docs/installer/en/setupBootloader.xml
index 938d2618..90a86690 100644
--- a/docs/installer/en/setupBootloader.xml
+++ b/docs/installer/en/setupBootloader.xml
@@ -1,137 +1,263 @@
 <?xml version='1.0' encoding='utf-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="setupBootloader">
   <!---->
 
-  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page-->
+  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
+
+Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 
   <info>
     <title xml:id="setupBootloader-ti1">Bootloader main options</title>
   </info>
 
-  <mediaobject>
-    <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>
-  </mediaobject>
-
   <section>
-    <title>With a Bios system</title>
+    <title>Bootloader interface</title>
 
-    <para xml:id="setupBootloader-pa1" revision="4">If you prefer different
-    bootloader settings to those chosen automatically by the installer, you
-    can change them here.</para>
+    <para>By default, Mageia uses exclusively:</para>
 
-    <para xml:id="setupBootloader-pa2" revision="4">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.</para>
+    <itemizedlist>
+      <listitem>
+        <para>Grub2 (with or without graphical menu) for a Legacy/MBR or
+        Legacy/GPT system</para>
+      </listitem>
+
+      <listitem>
+        <para>Grub2-efi for a UEFI system.</para>
+      </listitem>
+    </itemizedlist>
 
     <tip>
       <para>The Mageia graphical menus are nice :</para>
     </tip>
 
-    <section xml:id="usingMageiaBootloader">
-      <info>
-        <title xml:id="usingMageiaBootloader-ti2">Using a Mageia
-        bootloader</title>
-      </info>
-
-      <para xml:id="setupBootloader-pa4" revision="3">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.</para>
-
-      <para revision="3">Mageia now also offers GRUB2 as an optional
-      bootloader in addition to GRUB legacy and Lilo.</para>
-
-      <warning>
-        <para xml:id="setupBootloader-pa6" revision="3">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.</para>
-
-        <para revision="3">The best solution here is to use the GRUB2
-        bootloader which is available at the Summary page during
-        installation.</para>
-      </warning>
-    </section>
+    <section>
+      <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
 
-    <section xml:id="usingExistingBootloader">
-      <info>
-        <title xml:id="usingExistingBootloader-ti4" revision="2">Using an
-        existing bootloader</title>
-      </info>
-
-      <para xml:id="setupBootloader-pa46" revision="3">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.</para>
-
-      <para xml:id="setupBootloader-pa47" revision="1">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.</para>
-
-      <para xml:id="setupBootloader-pa48" revision="1">To be clear, sda is a
-      device, sda7 is a partition on that device.</para>
-
-      <tip>
-        <para revision="1" xml:id="setupBootloader-pa48a">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.</para>
-      </tip>
-
-      <para xml:id="setupBootloader-pa49" revision="2">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.</para>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx2-setupBootloader.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata xml:id="setupBootloader-im1" fileref="live-setupBootloader.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>Don't modify the "Boot Device" unless really knowing what you
+      do.</para>
     </section>
 
-    <section xml:id="advancedOptionBootloader">
-      <info>
-        <title xml:id="advancedOptionBootloader-ti5" revision="2">Bootloader
-        advanced option</title>
-      </info>
-
-      <para xml:id="setupBootloader-pa52" revision="3">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.</para>
+    <section>
+      <title>Grub2-efi on UEFI systems</title>
+
+      <para>With an UEFI system, the user interface is slightly different as
+      you cannot choose between with or without graphical menu</para>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="dx2-setupBootloader2.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="live-setupBootloader2.png"/>
+        </imageobject>
+      </mediaobject>
+
+      <para>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.</para>
+
+      <para>Don't modify the "Boot Device" unless really knowing what you
+      do.</para>
     </section>
   </section>
 
   <section>
-    <title>With an UEFI system</title>
+    <title xml:id="setupMageiaBootloader">Using a Mageia bootloader</title>
+
+    <para>By default, according to your system, Mageia writes a new:</para>
 
-    <para>With an UEFI system, the user interface is slightly different as you
-    cannot choose the boot loader since only Grub2-efi is available. </para>
+    <itemizedlist>
+      <listitem>
+        <para>GRUB2 bootloader either into the MBR (Master Boot Record) of
+        your first hard drive or in the BIOS boot partition.</para>
+      </listitem>
+
+      <listitem>
+        <para>Grub2-efi bootloader into the ESP</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>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></para>
 
     <mediaobject>
-      <imageobject condition="classical">
-        <imagedata fileref="dx2-setupBootloader2.png"/>
+      <imageobject>
+        <imagedata fileref="dx2-setupBootloader3.png"/>
       </imageobject>
-      <imageobject condition="live">
-        <imagedata fileref="live-setupBootloader2.png"/>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-setupBootloader3.png"/>
       </imageobject>
     </mediaobject>
+  </section>
+
+  <section>
+    <title>Using an existing bootloader</title>
+
+    <para>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.</para>
+  </section>
 
-    <para>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.</para>
+  <section>
+    <title xml:id="setupChainLoading">Using the chain loading</title>
+
+    <para>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>.</para>
 
-    <para>Don't modify the "Boot Device" unless really knowing what you
-    do.</para>
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-setupBootloader4.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="live-setupBootloader4.png"/>
+      </imageobject>
+    </mediaobject>
+
+    <para>You will get a warning that the bootloader will lack, ignore it by a
+    click on <guibutton>OK</guibutton>.</para>
+
+    <mediaobject>
+      <imageobject>
+        <imagedata fileref="dx2-setupBootloader5.png"/>
+      </imageobject>
+    </mediaobject>
+  </section>
+
+  <section>
+    <title>Options</title>
+
+    <section>
+      <title>First page</title>
+
+      <para><itemizedlist>
+          <listitem>
+            <para><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.</para>
+          </listitem>
+
+          <listitem>
+            <para><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.</para>
+          </listitem>
+
+          <listitem>
+            <para><guilabel>Password</guilabel>: This text box is where you
+            actually put the password</para>
+          </listitem>
+
+          <listitem>
+            <para><guilabel>Password (again)</guilabel>: Retype the password
+            and Drakx will check that it matches with the one set
+            above.</para>
+          </listitem>
+
+          <listitem>
+            <para><guilabel>Advanced</guilabel></para>
+
+            <itemizedlist>
+              <listitem>
+                <para><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).</para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Enable SMP</guilabel>: This option enables /
+                disables symmetric multiprocessing for multi core
+                processors.</para>
+              </listitem>
+
+              <listitem>
+                <para><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.</para>
+              </listitem>
+
+              <listitem>
+                <para><guilabel>Enable Local APIC</guilabel>: Here you can set
+                local APIC, which manage all external interrupts for some
+                specific processor in an SMP system.</para>
+              </listitem>
+            </itemizedlist>
+          </listitem>
+        </itemizedlist></para>
+    </section>
+
+    <section>
+      <title>Next page</title>
+
+      <itemizedlist>
+        <listitem>
+          <para><guilabel>Default:</guilabel> Operating system started up by
+          default</para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Append:</guilabel> This option lets you pass the
+          kernel information or tell the kernel to give you more information
+          as it boots.</para>
+        </listitem>
+
+        <listitem>
+          <para>P<guilabel>robe foreign OS</guilabel>: see above <link linkend="setupMageiaBootloader">Using a Mageia bootloader</link></para>
+        </listitem>
+
+        <listitem>
+          <para><guilabel>Advanced</guilabel><itemizedlist>
+              <listitem>
+                <para><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.</para>
+              </listitem>
+
+              <listitem>
+                <para><emphasis role="bold">Do not touch ESP or
+                MBR</emphasis>: see above <link linkend="setupChainLoading">Using the chain
+                loading</link></para>
+              </listitem>
+            </itemizedlist></para>
+        </listitem>
+      </itemizedlist>
+    </section>
   </section>
 </section>
 \ No newline at end of file
diff --git a/docs/installer/en/setupBootloaderAddEntry.xml b/docs/installer/en/setupBootloaderAddEntry.xml
index 0096b862..0af54953 100644
--- a/docs/installer/en/setupBootloaderAddEntry.xml
+++ b/docs/installer/en/setupBootloaderAddEntry.xml
@@ -1,74 +1,18 @@
 <?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="setupBootloaderAddEntry">
-  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page-->
+  <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page
+
+Lebarhon 2016 12 16 Updated for Mageia 6-->
 
   <info>
     <title xml:id="setupBootloaderAddEntry-ti1">Add or Modify a Boot Menu
     Entry</title>
   </info>
 
-  <mediaobject>
-    <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>
-  </mediaobject>
-
-  <section>
-    <title>With a Bios system</title>
-
-    <para>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.</para>
-
-    <note>
-      <para>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.</para>
-    </note>
-
-    <mediaobject>
-      <imageobject>
-        <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1" align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
-      </imageobject>
-    </mediaobject>
-
-    <para>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.</para>
-
-    <para>You can add the proper version number of an entry, or rename it
-    completely.</para>
-
-    <para>The default entry is the one the systems boots into if you don't
-    make a choice while booting up.</para>
-
-    <warning>
-      <para>Editing other things can leave you with an unbootable system.
-      Please don't just try something without knowing what you are
-      doing.</para>
-    </warning>
-  </section>
-
-  <section>
-    <title>With an UEFI system</title>
-
-    <para>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.</para>
-
-    <para>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.</para>
+  <para>To do that you need to manually edit /boot/grub2/custom.cfg or use the
+  software grub-customizer instead (Available in the Mageia
+  repositories).</para>
 
-    <mediaobject>
-      <imageobject>
-        <imagedata fileref="dx2-bootloaderConfiguration2.png"/>
-      </imageobject>
-    </mediaobject>
-  </section>
+  <note>
+    <para>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></para>
+  </note>
 </section>
 \ No newline at end of file
diff --git a/docs/installer/en/soundConfig.xml b/docs/installer/en/soundConfig.xml
index 62e92941..a9371cc2 100644
--- a/docs/installer/en/soundConfig.xml
+++ b/docs/installer/en/soundConfig.xml
@@ -1,54 +1,42 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<section xmlns="http://docbook.org/ns/docbook"
-	xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-	xmlns:ns4="http://www.w3.org/2000/svg"
-	xmlns:ns3="http://www.w3.org/1999/xhtml"
-	xmlns:ns2="http://www.w3.org/1999/xlink"
-	xmlns:ns="http://docbook.org/ns/docbook"
-	xml:id="soundConfig" version="5.0">
-
+<?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="soundConfig" version="5.0">
   <info>
     <title xml:id="soundConfig-ti1">Sound Configuration</title>
   </info>
 
-  <!-- Started by marja on 2013-12-07 -->
+  <!-- Lebarhon 20170209 updated SC-->
 
   <mediaobject>
     <imageobject>
-	    <imagedata fileref="dx2-soundConfig.png"  revision="1" format="PNG"
-		    xml:id="soundConfig-im1" />
+      <imagedata format="PNG" fileref="dx2-soundConfig.png" xml:id="soundConfig-im1" revision="1"/>
     </imageobject>
   </mediaobject>
 
-  <para>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.
-  </para>
-  <para>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.
-  </para>
-  <para>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.
-  </para>
+  <para>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.</para>
+
+  <para>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.</para>
+
+  <para>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.</para>
 
   <section xml:id="soundConfig-Advanced">
     <info>
       <title xml:id="soundConfig-Advanced-ti1">Advanced</title>
     </info>
 
-    <para>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.
-    </para>
-
-    <para>In that case you can select a different driver after clicking on 
-	    <guibutton>Let me pick any driver</guibutton>.
-    </para>
+    <para>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.</para>
 
+    <para>In that case you can select a different driver after clicking on
+    <guibutton>Let me pick any driver</guibutton>.</para>
   </section>
-</section>
+</section>
+\ No newline at end of file
diff --git a/docs/installer/en/uninstall-Mageia.xml b/docs/installer/en/uninstall-Mageia.xml
index b5be8f5a..e5c9b3b9 100644
--- a/docs/installer/en/uninstall-Mageia.xml
+++ b/docs/installer/en/uninstall-Mageia.xml
@@ -1,9 +1,10 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="uninstall-Mageia">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="uninstall-Mageia" version="5.0">
   <info>
     <title xml:id="uninstall-Mageia-ti1">Uninstalling Mageia</title>
   </info>
 
-  <!--Lebarhon 2015-07-06 Not true with UEFI -->
+  <!--Lebarhon 2015-07-06 Not true with UEFI 
+Lebarhon 2016 12 16 this page should be deleted or rewritten.-->
 
   <section>
     <title xml:id="uninstall-Mageia-ti2">Howto</title>
@@ -13,9 +14,10 @@
     the possibility to uninstall. This is not true for every operating
     system.</para>
 
-    <para>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.</para>
+    <para>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.</para>
 
     <para>To recover the space used by Mageia partitions on Windows, click on
     <code>Start -> Control Panel -> Administrative Tools -> Computer
@@ -25,8 +27,8 @@
     in the disk. Right click on each of these partitions and select
     <guibutton>Delete</guibutton>. The space will be freed.</para>
 
-    <para>If you are using Windows XP, you can create a new partition and format it (FAT32
-    or NTFS). It will get a partition letter.</para>
+    <para>If you are using Windows XP, you can create a new partition and
+    format it (FAT32 or NTFS). It will get a partition letter.</para>
 
     <para>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.
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index 6682287c..a1e946b2 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: 2016-07-17 11:30+0300\n"
+"POT-Creation-Date: 2017-02-10 18:38+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"
@@ -146,36 +146,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 ""
 
 #. 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 "
@@ -188,19 +175,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 "
@@ -208,21 +195,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 "
@@ -230,7 +217,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 "
@@ -238,7 +225,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 "
@@ -246,59 +233,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 "
@@ -306,7 +278,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, "
@@ -314,7 +286,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 "
@@ -322,7 +294,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 "
@@ -330,7 +302,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 "
@@ -627,19 +599,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 "
@@ -647,14 +619,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 "
@@ -666,20 +638,20 @@ 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
 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 "
@@ -688,32 +660,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>
@@ -1089,20 +1061,21 @@ 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 "
@@ -1111,7 +1084,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 "
@@ -1119,60 +1092,82 @@ 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 ""
 
 #. 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 "
@@ -1180,57 +1175,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>"
+"<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 "
@@ -1238,7 +1240,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 "
@@ -1249,7 +1251,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 "
@@ -1258,29 +1260,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 "
@@ -1288,67 +1297,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 "
@@ -1356,8 +1365,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 "
@@ -1369,17 +1409,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 ""
 
@@ -1471,24 +1511,20 @@ 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
 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 "
@@ -1496,26 +1532,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"
@@ -1621,6 +1657,11 @@ msgid ""
 "</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 ""
@@ -2130,28 +2171,14 @@ 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
-msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+#: en/misc-params.xml:10
+msgid "<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 "
@@ -2159,18 +2186,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 "
@@ -2178,109 +2227,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 "
@@ -2288,40 +2344,40 @@ 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> <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 "
@@ -2330,19 +2386,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 "
@@ -2350,51 +2406,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>
@@ -2403,24 +2460,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 ""
 
-#. 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>
@@ -2472,29 +2542,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 "
@@ -2503,7 +2573,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 "
@@ -2511,22 +2581,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 "
@@ -2534,112 +2604,83 @@ 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 ""
 
 #. 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 "
@@ -2647,62 +2688,52 @@ 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 "
@@ -2712,49 +2743,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 "
@@ -2763,12 +2799,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 "
@@ -2776,22 +2812,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 "
@@ -2801,43 +2837,43 @@ 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 "
@@ -2845,12 +2881,12 @@ msgid ""
 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 "
@@ -2860,19 +2896,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 "
@@ -2880,101 +2916,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 "
@@ -2982,7 +3018,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"
@@ -3012,73 +3048,72 @@ 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> <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 "
@@ -3087,28 +3122,27 @@ 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 ""
 
@@ -3360,270 +3394,334 @@ 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><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/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
-msgid "With a Bios system"
+#: en/setupBootloader.xml:13
+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 "Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system"
+msgstr ""
+
+#. type: Content of: <section><section><itemizedlist><listitem><para>
+#: en/setupBootloader.xml:24
+msgid "Grub2-efi for a UEFI system."
+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
-msgid "You can add the proper version number of an entry, or rename it completely."
+#. type: Content of: <section><section><section><mediaobject>
+#: en/setupBootloader.xml:58
+msgid ""
+"<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"
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:111
+msgid ""
+"<imageobject> <imagedata fileref=\"live-setupBootloader3.png\"/> "
+"</imageobject>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/setupBootloader.xml:11
-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>"
+#. 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>"
+"P<guilabel>robe 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 +3766,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 ""
 
-#.  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 +3787,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 +3797,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 "
@@ -3708,12 +3806,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 "
@@ -3721,7 +3819,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>."
@@ -3867,12 +3965,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 "
@@ -3880,7 +3978,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 "
@@ -3888,7 +3986,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 "
@@ -3900,14 +3998,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/uk.po b/docs/installer/uk.po
index 2268382f..d200d15b 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -1,13 +1,13 @@
 # Copyright (C) 2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2012, 2013, 2014, 2015, 2016, 2017.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:30+0300\n"
-"PO-Revision-Date: 2016-07-17 11:31+0300\n"
+"POT-Creation-Date: 2017-02-10 18:38+0200\n"
+"PO-Revision-Date: 2017-02-10 18:37+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -184,39 +184,27 @@ 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 ""
-"<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>"
 
 #. 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 "
@@ -236,7 +224,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."
@@ -245,12 +233,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 "
@@ -262,7 +250,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."
@@ -271,7 +259,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."
@@ -280,7 +268,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 "
@@ -291,7 +279,7 @@ 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 "
@@ -302,7 +290,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 "
@@ -313,44 +301,23 @@ 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>Центр керування 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
-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 ""
 "Якщо ви надаєте перевагу домашнім каталогам користувачів, вміст яких "
 "доступний всім іншим користувачам, вам варто додати всі записи майбутніх "
@@ -359,19 +326,19 @@ 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."
@@ -381,14 +348,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 "
@@ -400,7 +367,7 @@ 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, "
@@ -413,7 +380,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 +392,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 "
@@ -437,7 +404,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 "
@@ -831,12 +798,12 @@ msgstr ""
 "<link linkend=\"testing\">додаткові кроки портативного режиму</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."
@@ -846,7 +813,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 "
@@ -856,16 +823,16 @@ msgstr ""
 "слайдів можна натисканням кнопки <guilabel>Подробиці</guilabel>."
 
 #. 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 ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-chooseDesktop.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 "
@@ -891,22 +858,22 @@ 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
 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>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-choosePackageGroups.png"
+"\" align=\"center\"/> </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 "
@@ -919,22 +886,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."
@@ -943,14 +910,14 @@ 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 ""
-"Ознайомтеся з розділом <xref linkend=\"minimal-install\"></xref>, де "
-"викладено настанови щодо встановлення мінімальної системи (без чи з "
-"графічним сервером та IceWM)."
+"Ознайомтеся з розділом <xref linkend=\"minimal-install\"/>, де викладено "
+"настанови щодо встановлення мінімальної системи (без чи з графічним сервером "
+"та IceWM)."
 
 #. type: Content of: <section><info><title>
 #: en/choosePackagesTree.xml:4
@@ -1445,23 +1412,23 @@ 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
 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>"
+"<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 "
@@ -1474,7 +1441,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 "
@@ -1486,7 +1453,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."
@@ -1496,7 +1463,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"
@@ -1505,7 +1472,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."
@@ -1515,47 +1482,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
 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 (див. вище)."
+"(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\"/>"
-msgstr "<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 ""
+"<imageobject> <imagedata fileref=\"live-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 ""
+"<placeholder type=\"mediaobject\" id=\"0\"/><placeholder type=\"mediaobject"
+"\" id=\"1\"/>"
+
+#. 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
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/"
+"> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject> <imageobject> <imagedata fileref=\"live-doPartitionDisks3.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 "
@@ -1566,7 +1565,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."
@@ -1575,21 +1574,30 @@ 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 ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"/> </imageobject>"
 
+#. type: Content of: <section><mediaobject>
+#: en/doPartitionDisks.xml:28
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks.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."
@@ -1598,12 +1606,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."
@@ -1612,12 +1620,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 "Використовувати вільний простір на розділі 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."
@@ -1627,7 +1635,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 "
@@ -1638,7 +1646,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 "
@@ -1656,7 +1664,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 "
@@ -1670,7 +1678,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>"
@@ -1678,26 +1686,35 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
+#: en/doPartitionDisks.xml:85
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-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 "
@@ -1707,12 +1724,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)."
@@ -1721,12 +1738,12 @@ 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:"
@@ -1734,7 +1751,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."
@@ -1743,32 +1760,32 @@ 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 "Якщо загалом доступного місця понад 50 ГБ, буде створено три розділи"
 
 #. 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 від доступного місця, але не більше за 50 ГБ, буде віддано розділу /"
 
 #. 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 ГБ, буде віддано розділу резервної пам’яті на диску "
 "(swap)"
 
 #. 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."
@@ -1778,7 +1795,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 /"
@@ -1790,8 +1807,45 @@ msgstr ""
 "до /boot/EFI. Пункт «Нетиповий» є єдиним придатним до вибору, якщо виявлення "
 "UEFI було виконано належним чином."
 
+#. 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 ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:175
+msgid ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><note><mediaobject>
+#: en/doPartitionDisks.xml:181
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.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 "
@@ -1811,17 +1865,17 @@ 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 "«Вільне місце перед (МіБ)» «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 ""
@@ -1935,27 +1989,22 @@ 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
 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>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
+"align=\"center\" 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 "
@@ -1965,7 +2014,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)."
@@ -1975,7 +2024,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."
@@ -1984,12 +2033,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"
@@ -2125,6 +2174,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 ""
@@ -2808,30 +2862,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
 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=\"dx2-summary.png\" revision=\"1\" align="
-"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summaryTop.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 "
@@ -2843,18 +2883,40 @@ msgstr ""
 "ознайомитися з вибраними параметрами та, якщо потрібно, змінити їх: для "
 "цього достатньо натиснути кнопку <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\"/"
@@ -2865,12 +2927,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>Країна / Регіон</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\"/>"
@@ -2880,36 +2942,34 @@ 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"
-msgstr ""
-"Не вносьте ніяких змін, якщо ви не є знавцем з налаштовування Grub і/або Lilo"
+#: en/misc-params.xml:66
+msgid "Do not change anything, unless you know how to configure Grub2"
+msgstr "Не вносьте ніяких змін, якщо ви не є знавцем з налаштовування Grub2"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/misc-params.xml: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."
@@ -2918,12 +2978,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."
@@ -2933,7 +2993,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."
@@ -2942,24 +3002,24 @@ 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."
@@ -2968,13 +3028,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."
@@ -2983,12 +3050,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 "
@@ -2999,45 +3066,45 @@ 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
 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=\"summaryBottom-im1\" align="
+"\"center\" fileref=\"dx2-summaryBottom.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 "
@@ -3050,7 +3117,7 @@ msgstr ""
 "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."
@@ -3059,12 +3126,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 "
@@ -3075,7 +3142,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"
@@ -3084,17 +3151,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."
@@ -3104,19 +3171,19 @@ 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."
@@ -3126,10 +3193,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 ""
 "Виберіть служби, яким має бути дозволено доступ до вашої системи. Вибір "
 "служб залежатиме від призначення комп’ютера, на якому працює операційна "
@@ -3143,26 +3212,18 @@ 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
-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>"
-
 #. type: Content of: <section><para>
-#: en/reboot.xml:19
+#: en/reboot.xml:9
+#, 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)."
+"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 ""
 "Після встановлення завантажувача програма попросить вас перервати роботу "
 "системи, вийняти з лотка компакт-диск, від’єднати від комп’ютера флешку і "
@@ -3171,6 +3232,31 @@ msgstr ""
 "процесу отримання даних сховищ із програмним забезпеченням (див. «Керування "
 "програмним забезпеченням»)."
 
+#. type: Content of: <section><mediaobject>
+#: en/reboot.xml:15
+msgid "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"live-reboot2.png\"/> </imageobject>"
+
+#. type: Content of: <section><para>
+#: en/reboot.xml:20
+msgid ""
+"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 ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
+"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
+
 #. type: Content of: <section><info><title>
 #: en/resizeFATChoose.xml:16
 msgid ""
@@ -3234,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."
@@ -3254,12 +3340,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. "
@@ -3273,7 +3359,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 "
@@ -3285,22 +3371,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 "
@@ -3311,7 +3397,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>."
@@ -3320,42 +3406,42 @@ 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 ""
 "Вони придатні для встановлення «з нуля» або оновлення попередніх випусків."
 
 #. 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."
@@ -3364,59 +3450,27 @@ 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 "Портативний носій"
 
 #. 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."
@@ -3426,18 +3480,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.</"
@@ -3448,63 +3504,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 "Портативний CD з KDE"
+#: en/SelectAndUseISOs2.xml:130
+#, fuzzy
+msgid "Live DVD Plasma"
+msgstr "Портативний 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 "Портативний CD з GNOME"
+#: en/SelectAndUseISOs2.xml:148
+msgid "Live DVD GNOME"
+msgstr "Портативний 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 "Портативний 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 "Портативний 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 "
@@ -3518,7 +3568,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 "
@@ -3529,13 +3579,18 @@ msgstr ""
 "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
+msgid "netinstall.iso"
+msgstr "netinstall.iso"
 
 #. 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."
@@ -3544,12 +3599,12 @@ msgstr ""
 "не бажають користуватися невільними пакунками."
 
 #. type: Content of: <section><section><section><section><title>
-#: en/SelectAndUseISOs2.xml:269
-msgid "boot-nonfree.iso"
-msgstr "boot-nonfree.iso"
+#: en/SelectAndUseISOs2.xml:229
+msgid "netinstall-nonfree.iso"
+msgstr "netinstall-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."
@@ -3558,17 +3613,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 "
@@ -3582,12 +3637,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>. "
@@ -3599,22 +3654,22 @@ 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 "
@@ -3630,13 +3685,13 @@ 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>."
@@ -3645,7 +3700,7 @@ msgstr ""
 "файла/образу.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>."
@@ -3654,7 +3709,7 @@ msgstr ""
 "образу.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:"
@@ -3663,17 +3718,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."
@@ -3683,12 +3738,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 на компакт-диск або 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 "
@@ -3702,12 +3757,12 @@ msgstr ""
 "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."
@@ -3716,7 +3771,7 @@ msgstr ""
 "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 "
@@ -3727,7 +3782,7 @@ 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."
@@ -3736,12 +3791,12 @@ 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>"
@@ -3751,17 +3806,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;"
@@ -3770,7 +3825,7 @@ msgstr ""
 "допомогою пункту «ISO 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>"
@@ -3779,12 +3834,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."
@@ -3793,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 '-' )"
@@ -3812,12 +3867,12 @@ msgstr ""
 "userinput> (не забудьте «-» наприкінці команди)"
 
 #. 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)"
@@ -3827,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</"
@@ -3849,7 +3904,7 @@ 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"
@@ -3891,7 +3946,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."
@@ -3900,7 +3955,7 @@ msgstr ""
 "знімку <code>/dev/sdb</code> це пристрій місткістю 8 ГБ, тобто флешка 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>"
@@ -3909,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>"
@@ -3923,37 +3978,34 @@ 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 "Віддайте таку команду: # <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
 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=\"selectCountry-im1\" align="
+"\"center\" fileref=\"dx2-selectCountry.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 ""
@@ -3963,7 +4015,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."
@@ -3972,7 +4024,7 @@ msgstr ""
 "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 "
@@ -3984,38 +4036,34 @@ msgstr ""
 "це, 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
 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> ви також можете вибрати "
 "спосіб введення (за допомогою нижньої частини списку). Способи введення "
 "надають змогу користувачам вводити символи запису східних мов (китайської, "
 "японської, корейської тощо). Типовим способом введення на DVD з Mageia та "
-"портативних образах системи для Африки/Індії та Азії є IBus. Для локалей "
-"азійських та африканських країн IBus буде визначено типовим способом "
-"введення, отже користувачам не доведеться налаштовувати нічого вручну. Інші "
-"способи введення (SCIM, GCIN, HIME тощо), які надають користувачам подібні "
-"можливості, можна встановити, якщо перед вибором пакунків було додано "
-"сховища пакунків HTTP/FTP."
+"портативних образах системи є IBus, отже користувачам не доведеться "
+"налаштовувати нічого вручну. Інші способи введення (SCIM, GCIN, HIME тощо), "
+"які надають користувачам подібні можливості, можна встановити, якщо перед "
+"вибором пакунків було додано сховища пакунків HTTP/FTP."
 
 #. 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 ""
 "Якщо спосіб введення потрібен вам після встановлення системи, ви можете "
@@ -4357,365 +4405,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\">тут</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
 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>kcm-grub2</code>, <code>grub-"
-"customizer</code>, або внести зміни до <code>/boot/grub2/custom.cfg</code> "
-"вручну."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </imageobject>"
 
-#. 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 ""
-"<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>"
 
-#. 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 system, інтерфейс користувача трохи "
+"відрізнятиметься, оскільки ви не зможете вибрати завантажувач, доступним "
+"буде лише 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
 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-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
 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) для "
+"зберігання завантажувача (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
 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-setupBootloader3.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
 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-setupBootloader3.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 до меню "
+"вже встановленого завантажувача не є предметом цієї довідкової сторінки. "
+"Втім, здебільшого, ці кроки пов’язано з запуском відповідної програми "
+"встановлення завантажувача, яка має виявити і додати пункт системи у "
+"автоматичному режимі. Відповідні пояснення має бути наведено у документації "
+"до іншої операційної системи."
+
+#. 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
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader4.png\"/> </"
+"imageobject>"
 
-#. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:41
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:142
 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 (застарілу версію) до MBR "
-"(основного запису завантаження) першого диска вашого комп’ютера. Якщо на "
-"диску вже було встановлено операційні системи, Mageia спробує додати пункти "
-"цих операційних систем до нового меню завантаження Mageia."
+"<imageobject> <imagedata fileref=\"live-setupBootloader4.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 та Lilo."
 
-#. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:51
+#. type: Content of: <section><section><mediaobject>
+#: en/setupBootloader.xml:151
 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 (застарілої версії)."
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader5.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 буде "
-"перезаписано. Вам слід вибрати кореневий розділ, який було вибрано під час "
-"кроку розподілу диска на розділи, наприклад «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
+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> (кореневого каталогу). Повернутися до вікна засобу "
-"встановлення можна за допомогою натискання комбінації клавіш 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>Додатково</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 system, інтерфейс користувача трохи "
-"відрізнятиметься, оскільки ви не зможете вибрати завантажувач, доступним "
-"буде лише 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>"
+"P<guilabel>robe 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 виявить наявні розділи 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
@@ -4767,22 +4833,22 @@ 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
 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>"
+"<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-soundConfig.png\" xml:"
+"id=\"soundConfig-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 "
@@ -4793,7 +4859,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 "
@@ -4808,7 +4874,7 @@ msgstr ""
 "<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</"
@@ -4820,12 +4886,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 "
@@ -4837,7 +4903,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>."
@@ -5015,12 +5081,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 "
@@ -5032,7 +5098,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 "
@@ -5044,7 +5110,7 @@ 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 -"
@@ -5064,7 +5130,7 @@ msgstr ""
 "<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."
@@ -5074,7 +5140,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 "
@@ -5138,6 +5204,318 @@ 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 "Портативний CD з KDE"
+
+#~ msgid "32 bit only."
+#~ msgstr "Лише 32-бітова версія."
+
+#~ msgid "Live CD GNOME"
+#~ msgstr "Портативний 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>. Це допоможе зекономити трохи "
+#~ "місця."
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 #~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
 #~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
@@ -5156,13 +5534,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>"
@@ -5256,9 +5627,6 @@ msgstr ""
 #~ "\"center\" format=\"PNG\" xml:id=\"installer-im2\"></imagedata> </"
 #~ "imageobject>"
 
-#~ msgid "Kernel Options"
-#~ msgstr "Параметри ядра"
-
 #~ msgid ""
 #~ "This section allows you to fine tune your sound card. In most cases the "
 #~ "options selected will work with your computer."
@@ -5314,9 +5682,6 @@ msgstr ""
 #~ "відповідала назві файла для кнопки довідки на сторінці «Налаштування "
 #~ "графічної картки і монітора» у встановлювачі."
 
-#~ msgid "Bootloader expert use"
-#~ msgstr "Додаткові можливості керування завантажувачем"
-
 #~ msgid ""
 #~ "If you haven't done so yet, please read <xref linkend=\"setupBootloader\"/"
 #~ "> first."
author	Yuri Chornoivan <yurchor@ukr.net>	2017-02-10 18:39:25 +0200
committer	Yuri Chornoivan <yurchor@ukr.net>	2017-02-10 18:39:25 +0200
commit	b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46 (patch)
tree	cce0e9fff47b08681efd9cfdc2bcd102ee87e953
parent	dd8d5e60b84580f8adde578f1c82fed86725932a (diff)
download	tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar.gz tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar.bz2 tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.tar.xz tools-b0ff34d8fa0263a8d9f7cbc2ebd2bd77b9f86a46.zip