Update Catalan translation

9 files changed, 85 insertions, 268 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index c15805d6..0a64a039 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -8,7 +8,7 @@
 # Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2013-2015
 # Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2015
 # Davidmp <medipas@gmail.com>, 2016-2017
-# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2017
+# Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015,2017
 # Robert Antoni Buj Gelonch <rbuj@fedoraproject.org>, 2015
 # Yuri Chornoivan <yurchor@ukr.net>, 2016
 msgid ""
@@ -16,7 +16,7 @@ msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
 "POT-Creation-Date: 2017-03-14 20:10+0200\n"
-"PO-Revision-Date: 2017-02-13 15:29+0000\n"
+"PO-Revision-Date: 2017-03-27 14:38+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
 "ca/)\n"
@@ -505,7 +505,7 @@ msgstr ""
 #. type: Content of: <section><info><title>
 #: en/bestTime.xml:10
 msgid "Clock settings"
-msgstr ""
+msgstr "Paràmetres del rellotge"
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
@@ -513,6 +513,8 @@ msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -525,21 +527,23 @@ msgstr ""
 #: en/bestTime.xml:23
 msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
+"A la pestanya de configuració avançada trobareu més opcions sobre els "
+"paràmetres del rellotge."
 
 #. type: Content of: <section><info><title>
 #: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
-msgstr ""
+msgstr "Arrencada de Mageia com a sistema autònom"
 
 #. type: Content of: <section><section><info><title>
 #: en/bootLive.xml:1
 msgid "Booting the medium"
-msgstr ""
+msgstr "Arrencada del mitjà"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/bootLive.xml:1
 msgid "From a disc"
-msgstr ""
+msgstr "Des d'un disc"
 
 #. type: Content of: <section><section><section><para>
 #: en/bootLive.xml:1
@@ -562,7 +566,7 @@ msgstr ""
 #. type: Content of: <section><section><section><info><title>
 #: en/bootLive.xml:7
 msgid "From a USB device"
-msgstr ""
+msgstr "Des d'un dispositiu USB"
 
 #. type: Content of: <section><section><section><para>
 #: en/bootLive.xml:7
@@ -577,7 +581,7 @@ msgstr ""
 #. type: Content of: <section><section><info><title>
 #: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
-msgstr ""
+msgstr "En mode BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
@@ -588,7 +592,7 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
-msgstr ""
+msgstr "La primera pantalla de l'arrencada en mode BIOS"
 
 #. type: Content of: <section><section><para>
 #: en/bootLive.xml:12
@@ -667,7 +671,7 @@ msgstr ""
 #. type: Content of: <section><section><info><title>
 #: en/bootLive.xml:29
 msgid "In UEFI mode"
-msgstr ""
+msgstr "En mode UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
@@ -681,7 +685,7 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
-msgstr ""
+msgstr "La primera pantalla de l'arrencada en un sistema UEFI des del disc"
 
 #. type: Content of: <section><section><para>
 #: en/bootLive.xml:29
@@ -1366,17 +1370,11 @@ msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
 #: en/diskdrake.xml:57
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
 #: en/diskdrake.xml:56 en/installer.xml:41
@@ -1392,18 +1390,12 @@ msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
 #: en/diskdrake.xml:71
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
 "\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:9
@@ -1432,18 +1424,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:22
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks.png\" align="
 "\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:33
@@ -1527,18 +1513,12 @@ msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
 #: en/doPartitionDisks.xml:77
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
 "\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:88
@@ -1649,18 +1629,12 @@ msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
 #: en/doPartitionDisks.xml:165
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
 #: en/doPartitionDisks.xml:175
@@ -3995,18 +3969,12 @@ msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/setupBootloader.xml:36
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
 "setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:45 en/setupBootloader.xml:73
@@ -4028,18 +3996,12 @@ msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/setupBootloader.xml:56
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-setupBootloader2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:65
@@ -4086,18 +4048,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:100
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader3.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-setupBootloader3.png\" align="
 "\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:111
@@ -4134,18 +4090,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:129
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader4.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-setupBootloader4.png\" align="
 "\"center\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
-"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
-"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
-"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
-"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:138
@@ -4630,6 +4580,3 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
-
-#~ msgid "Different media for architecture 32 or 64 bits."
-#~ msgstr "Suports diferents per a arquitectura de 32 ó 64 bits."
diff --git a/docs/installer/ca/SelectAndUseISOs2.xml b/docs/installer/ca/SelectAndUseISOs2.xml
index bde45f69..cc2e0ccd 100644
--- a/docs/installer/ca/SelectAndUseISOs2.xml
+++ b/docs/installer/ca/SelectAndUseISOs2.xml
@@ -1,21 +1,16 @@
-<?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:lang="ca" xml:id="Select-and-use-ISOs">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ca" xml:id="Select-and-use-ISOs">
   
-
   <info>
     <!-- Made by Lebarhon 2014 03 26 
 
 Lebarhon updated for Mageia 6 2016 12 16 (still waiting for clarification about 1.3.2-->
 <title xml:id="Select-and-use-ISOs-ti1">Selecció i utilització de les ISOs</title>
   </info>
-
   <section>
     <title>Introducció</title>
-
     <para>Mageia is distributed via ISO images. This page will help you to choose
 which image match your needs.</para>
-
     <para>There is two families of media:</para>
-
     <itemizedlist>
       <listitem>
         <para>Classical installer: After booting the media, it will follow a process
@@ -23,66 +18,51 @@ allowing to choose what to install and how to configure your target
 system. This give you the maximal flexibility for a customized installation,
 in particular to choose which Desktop Environment you will install.</para>
       </listitem>
-
       <listitem>
         <para>LIVE media: you can boot the media in a real Mageia system without
 installing it, to see what you will get after installation.  The
 installation process is simpler, but you get lesser choices.</para>
       </listitem>
     </itemizedlist>
-
     <para>Details are given in the next sections.</para>
   </section>
-
   <section>
     <title>Suport</title>
-
     <section>
       <title>Definició</title>
-
       <para>Here, a medium (plural: media) is an ISO image file that allows you to
 install and/or update Mageia and by extension any physical support the ISO
 file is copied to.</para>
-
       <para>Els podeu trobar <link
 ns4:href="http://www.mageia.org/en/downloads/">aquí</link>.</para>
     </section>
-
     <section>
       <title>Suports d'instal·lació clàssics</title>
-
       <section>
         <title>Característiques comunes</title>
-
         <itemizedlist>
           <listitem>
             <para>Aquestes ISOs fan servir l'instal·lador clàssic anomenat drakx.</para>
           </listitem>
-
           <listitem>
             <para>Poden fer una instal·lació neta o bé una actualització des de versions
 anteriors.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>DVD</title>
-
         <itemizedlist>
           <listitem>
             <para>Suports diferents per a arquitectura de 32 ó 64 bits.</para>
           </listitem>
-
           <listitem>
             <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
 Hardware Detection Tool.</para>
           </listitem>
-
           <listitem>
             <para>Cada DVD conté diversos entorns d'escriptori disponible i diversos idiomes.</para>
           </listitem>
-
           <listitem>
             <para>Durant la instal·lació se us oferirà la possibilitat d'afegir programari de
 propietat.</para>
@@ -90,101 +70,79 @@ propietat.</para>
         </itemizedlist>
       </section>
     </section>
-
     <section>
       <title>Mitjà autònom</title>
-
       <section>
         <title>Característiques comunes</title>
-
         <itemizedlist>
           <listitem>
             <para>Es pot utilitzar per a tenir una previsualització de la distribució sense
 instal·lar-la al disc dur, amb la possibilitat d'instal·lar Mageia al disc
 dur si ho voleu.</para>
           </listitem>
-
           <listitem>
             <para>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</para>
           </listitem>
-
           <listitem>
             <para>Suports diferents per a arquitectura de 32 ó 64 bits.</para>
           </listitem>
-
           <listitem>
             <para><emphasis role="bold">Live ISOs can only be used to create clean
 installations, they cannot be used to upgrade from previous
 releases.</emphasis></para>
           </listitem>
-
           <listitem>
             <para>Contenen programari de propietat.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>Live DVD Plasma</title>
-
         <itemizedlist>
           <listitem>
             <para>Plasma desktop environment only.</para>
           </listitem>
-
           <listitem>
             <para>Conté tots els idiomes.</para>
           </listitem>
-
           <listitem>
             <para>Suports diferents per a arquitectura de 32 ó 64 bits.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>DVD autònom de GNOME</title>
-
         <itemizedlist>
           <listitem>
             <para>Només entorn d'escriptori GNOME.</para>
           </listitem>
-
           <listitem>
             <para>Conté tots els idiomes.</para>
           </listitem>
-
           <listitem>
             <para>Suports diferents per a arquitectura de 32 ó 64 bits.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>Live DVD Xfce</title>
-
         <itemizedlist>
           <listitem>
             <para>Xfce desktop environment only.</para>
           </listitem>
-
           <listitem>
             <para>Conté tots els idiomes.</para>
           </listitem>
-
           <listitem>
             <para>Suports diferents per a arquitectura de 32 ó 64 bits.</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
-
     <section>
       <title>Suport CD només d'arrencada</title>
-
       <section>
         <title>Característiques comunes</title>
-
         <itemizedlist>
           <listitem>
             <para>Each one is a small image that contains no more than that which is needed to
@@ -193,26 +151,21 @@ that are needed to continue and complete the install. These packages may be
 on the PC hard disk, on a local drive, on a local network or on the
 Internet.</para>
           </listitem>
-
           <listitem>
             <para>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.</para>
           </listitem>
-
           <listitem>
             <para>Suports diferents per a arquitectura de 32 ó 64 bits.</para>
           </listitem>
-
           <listitem>
             <para>Només en anglès.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>netinstall.iso</title>
-
         <itemizedlist>
           <listitem>
             <para>Només conté programari lliure, per a qui rebutja la utilització de
@@ -220,10 +173,8 @@ programari de propietat.</para>
           </listitem>
         </itemizedlist>
       </section>
-
       <section>
         <title>netinstall-nonfree.iso</title>
-
         <itemizedlist>
           <listitem>
             <para>Conté programari de propietat (principalment controladors, còdecs...) per a
@@ -233,148 +184,109 @@ qui el necessiti.</para>
       </section>
     </section>
   </section>
-
   <section>
     <title>Baixada i comprovació del mitjà</title>
-
     <section>
       <title>Baixada</title>
-
       <para>Once you have chosen your ISO file, you can download it using either http or
 BitTorrent. In both cases, a window gives you some information, such as the
 mirror in use and the possibility to change if the bandwidth is to low. If
 http is chosen, you may also see something like</para>
-
       <mediaobject>
 <imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
-
       <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
 them. Keep one of them <link linkend="integrity">for further
 usage</link>. Then this window appears:</para>
-
       <mediaobject>
 <imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
-
       <para>Check the radio button Save File.</para>
     </section>
-
     <section>
       <title xml:id="integrity">Comprovació de la integritat del suport baixat</title>
-
       <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
 file to be downloaded. When you ask these algorithms to recalculate this
 number from your downloaded file, either you have the same number and your
 downloaded file is correct, or the number is different and you have a
-failure. A failure infers that you should retry the download.</para>
-
+failure. A failure infers that you should retry the download or attempt a
+repair using BitTorrent.</para>
       <para>Obriu una consola, no cal que sigueu l'usuari primari, i:</para>
-
       <para>- Per a fer servir md5sum, teclegeu: [sam@localhost]$ <userinput>md5sum
 camí/cap/a/la/imatge/fitxer.iso</userinput>.</para>
-
       <para>- Per a fer servir sha1sum, teclegeu [sam@localhost]$ <userinput>sha1sum
 camí/cap/a/la/imatge/fitxer.iso</userinput>.</para>
-
       <para>and compare the obtained number on your computer (you may have to wait for a
 while) with the number given by Mageia. Example:</para>
-
       <mediaobject>
 <imageobject> <imagedata fileref="../Md5sum.png"/> </imageobject></mediaobject>
-
       <para/>
     </section>
   </section>
-
   <section>
     <title>Enregistrament o bolcat de l'ISO</title>
-
     <para>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
+stick. These operations are not a simple copy and aim to make a bootable
 medium.</para>
-
     <section>
       <title>Enregistrament de l'ISO a un CD/DVD</title>
-
       <para>Use whatever burner you wish but ensure the burning device is set correctly
 to <emphasis role="bold">burn an image</emphasis>, burn data or files is not
 correct. There is more information in <link
 ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
 wiki</link>.</para>
     </section>
-
     <section>
       <title>Bolcat de l'ISO a un llapis de memòria USB</title>
-
       <para>Totes les ISO de Mageia són híbrides, que vol dir que les podeu «bolcar» a
 un llapis de memòria USB i després fer-lo servir per a arrencar i instal·lar
 el sistema.</para>
-
       <warning>
-        <para>"dumping" an image onto a flash device destroys any previous file-system on
+        <para>"Dumping" an image onto a flash device destroys any previous file-system on
 the device; any other data will be lost and the partition capacity will be
 reduced to the image size.</para>
       </warning>
-
       <para>To recover the original capacity, you must redo partitioning and re-format
 the USB stick.</para>
-
       <section>
         <title>Using a graphical tool within Mageia</title>
-
         <para>You can use a graphical tool like <link
 ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
       </section>
-
       <section>
         <title>Using a graphical tool within Windows</title>
-
         <para>Podeu provar:</para>
-
         <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
 "ISO image" option;</para>
-
         <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
 Disk Imager</link></para>
       </section>
-
       <section>
         <title>Using Command line within a GNU/Linux system</title>
-
         <warning>
           <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
 disc partition if you get the device-ID wrong.</para>
         </warning>
-
         <para>També podeu fer servir l'eina dd en una consola:</para>
-
         <orderedlist>
           <listitem>
             <para>Obriu una consola</para>
           </listitem>
-
           <listitem>
             <para>Convertiu-vos en usuari primari amb l'ordre <userinput>su -</userinput> (no
 oblideu el «-» final)</para>
-
             <mediaobject>
 <imageobject> <imagedata fileref="../Root.png"/> </imageobject></mediaobject>
           </listitem>
-
           <listitem>
-            <para>Plug your USB stick (do not mount it, this also means do not open any
+            <para>Plug in your USB stick (do not mount it, this also means do not open any
 application or file manager that could access or read it)</para>
           </listitem>
-
           <listitem>
             <para>Introduïu l'ordre <userinput>fdisk -l</userinput></para>
-
             <mediaobject>
 <imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
-
             <para>Alternatively, you can get the device name with the command
 <code>dmesg</code>: at end, you see the device name starting with
 <emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
-
             <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -394,26 +306,20 @@ application or file manager that could access or read it)</para>
 [72595.967251]  <emphasis>sdd</emphasis>: sdd1
 [72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
           </listitem>
-
           <listitem>
             <para>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.</para>
           </listitem>
-
           <listitem>
             <para>Introduïu l'ordre: # <userinput>dd if=camí/al/fitxer/ISO of=/dev/sdX
 bs=1M</userinput></para>
-
             <para>On X=nom del dispositiu, per exemple: /dev/sdc</para>
-
             <para>Exemple: # <userinput>dd if=/home/usuari/Baixades/Mageia-4-x86_64-DVD.iso
 of=/dev/sdb bs=1M</userinput></para>
           </listitem>
-
           <listitem>
             <para>Introduïu l'ordre: # <userinput>sync</userinput></para>
           </listitem>
-
           <listitem>
             <para>Desconnecteu el llapis de memòria USB, ja està</para>
           </listitem>
diff --git a/docs/installer/ca/addUser.xml b/docs/installer/ca/addUser.xml
index bb1fd2ee..d5549460 100644
--- a/docs/installer/ca/addUser.xml
+++ b/docs/installer/ca/addUser.xml
@@ -1,22 +1,18 @@
-<?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:lang="ca" xml:id="addUser">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns5="http://www.w3.org/1999/xhtml" version="5.0" xml:lang="ca" xml:id="addUser">
   <info>
     <title xml:id="addUser-ti1">Gestió d'usuaris i superusuari</title>
   </info>
-
   
-
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <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></mediaobject>
-
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Estableix la contrasenya d'administrador (root):</title>
     </info>
-
     <para>Per a qualsevol instal·lació de <application>Mageia</application> és
 aconsellable que establiu una contrasenya de superusuari o administrador,
 normalment anomenada <emphasis>contrasenya de root</emphasis> en Linux. A
@@ -25,82 +21,66 @@ canviarà de vermell a groc i a verd en funció de la fortalesa de la
 contrasenya. Un escut verd indica que la contrasenya és forta. Heu de
 repetir la mateixa contrasenya a la casella de sota, per a comprovar per
 comparació que no heu teclejat malament la primera contrasenya.</para>
-
     <note xml:id="givePassword">
       <para>Totes les contrasenyes distingeixen entre majúscules i minúscules. És
 recomanable fer servir una barreja de lletres (majúscules i minúscules),
 nombres i altres caràcters.</para>
     </note>
   </section>
-
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Introduïu un usuari</title>
     </info>
-
     <para>Afegiu aquí un usuari. Un usuari té menys permisos que el superusuari
 (root), però prou per a navegar per Internet, fer servir aplicacions
 ofimàtiques o jugar, i fer qualsevol altra cosa que un usuari mitjà fa amb
 el seu ordinador.</para>
-
     <itemizedlist>
       <listitem>
         <para><guibutton>Icona</guibutton>: si hi cliqueu, canviarà la icona d'usuari.</para>
       </listitem>
-
       <listitem>
         <para><guilabel>Nom real</guilabel>: poseu-hi el nom real de l'usuari.</para>
       </listitem>
-
       <listitem>
         <para><guilabel>Nom de connexió</guilabel>: poseu-hi el nom de connexió de
 l'usuari o deixeu que drakx en creï un a partir del nom real de
 l'usuari. <emphasis>El nom de connexió distingeix entre majúscules i
 minúscules</emphasis></para>
       </listitem>
-
       <listitem>
         <para><guilabel>Password</guilabel>: In this text box you should type in the user
 password. There is a shield at the end of the text box that indicates the
 strength of the password. (See also <xref linkend="givePassword"/>)</para>
       </listitem>
-
       <listitem>
         <para><guilabel>Contrasenya (una altra vegada)</guilabel>: torneu a escriure-hi la
 contrasenya i drakx comprovarà que hi hagi la mateixa contrasenya en les
 dues caselles.</para>
       </listitem>
     </itemizedlist>
-
     <note>
       <para>Any user you add while installing Mageia, will have a both read and write
 protected home directory (umask=0027).</para>
-
       <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>Els permisos d'accés també es poden modificar després de la instal·lació.</para>
     </note>
   </section>
-
   <section xml:id="addUserAdvanced" condition="classical">
     <info>
       <title xml:id="addUserAdvanced-ti3">Gestió avançada d'usuaris</title>
     </info>
-
     <para>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.</para>
-
     <para condition="classical">Additionally, you can disable or enable a guest account.</para>
-
     <warning condition="classical">
       <para>Tot allò que un convidat, amb un compte predeterminat
 <emphasis>rbash</emphasis>, desi al seu directori /home serà esborrat quan
 tanqui la sessió. El convidat hauria de desar els fitxers importants en una
 memòria USB.</para>
     </warning>
-
     <itemizedlist>
       <listitem condition="classical">
         <para><guilabel>Activa el compte del convidat</guilabel>: aquí podeu activar o
@@ -108,19 +88,16 @@ desactivar el compte d'un convidat. Aquest tipus de compte permet a un
 convidat iniciar la sessió i fer servir el PC, però té un accés més
 restringit que els usuaris normals.</para>
       </listitem>
-
       <listitem>
         <para><guilabel>Intèrpret d'ordres</guilabel>: aquesta llista desplegable us
 permet canviar el tipus d'intèrpret d'ordres per a l'usuari que acabeu
 d'afegir a la pantalla anterior. Les opcions són Bash, Dash i Sh.</para>
       </listitem>
-
       <listitem>
         <para><guilabel>ID d'usuari</guilabel>: aquí podeu establir l'ID d'usuari per a
 l'usuari que acabeu d'afegir a la pantalla anterior. És un nombre. Deixeu-lo
 en blanc excepte si sabeu què esteu fent.</para>
       </listitem>
-
       <listitem>
         <para><guilabel>ID de grup</guilabel>: aquí podeu establir l'ID de grup. També és
 un nombre, habitualment el mateix que per a l'usuari. Deixeu-lo en blanc
diff --git a/docs/installer/ca/bestTime.xml b/docs/installer/ca/bestTime.xml
index f43a17dc..333a1f31 100644
--- a/docs/installer/ca/bestTime.xml
+++ b/docs/installer/ca/bestTime.xml
@@ -7,7 +7,7 @@
          xmlns:ns3="http://www.w3.org/1998/Math/MathML"
          xmlns:ns="http://docbook.org/ns/docbook">
   <info>
-    <title xml:id="bestTime-ti1">Clock settings</title>
+    <title xml:id="bestTime-ti1">Paràmetres del rellotge</title>
   </info>
 
   <mediaobject condition="live">
@@ -17,5 +17,6 @@ format="PNG" revision="1" xml:id="bestTime-im1"/> </imageobject></mediaobject>
   <para>In this step, you have to select on which time your internal clock is set,
 either local time or UTC time.</para>
 
-  <para>In advanced tab, you will find more options about clock settings.</para>
+  <para>A la pestanya de configuració avançada trobareu més opcions sobre els
+paràmetres del rellotge.</para>
 </section>
diff --git a/docs/installer/ca/bootLive.xml b/docs/installer/ca/bootLive.xml
index 91f311b9..e099a0a3 100644
--- a/docs/installer/ca/bootLive.xml
+++ b/docs/installer/ca/bootLive.xml
@@ -1,14 +1,14 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="ca"><info><title xml:id="bootLive-ti1">Boot Mageia as Live system</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Booting the medium</title></info><section><info><title xml:id="bootLive11-ti1">From a disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="bootLive" version="5.0" xml:lang="ca"><info><title xml:id="bootLive-ti1">Arrencada de Mageia com a sistema autònom</title></info><section xml:id="bootLive-1"><info><title xml:id="bootLive1-ti1">Arrencada del mitjà</title></info><section><info><title xml:id="bootLive11-ti1">Des d'un disc</title></info><para>You can boot directly from the media you used to burn your image (CD-ROM,
 DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the
 bootloader to launch the installation automatically after rebooting the
 computer. If that does not happen you may need to reconfigure your BIOS or
 press one key that will offer you to choose the peripheral from which the
 computer will boot.</para><para>According to which hardware you have, and how it is configured, you get
-either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">From a USB device</title></info><para>You can boot from the USB device on which you dumped your image
+either one or another of the two screens below.</para></section><section><info><title xml:id="bootLive12-ti1">Des d'un dispositiu USB</title></info><para>You can boot from the USB device on which you dumped your image
 ISO. According to your BIOS settings, the computer boots perhaps directly on
 the USB device already plugged in a port. If that does not happen you may
 need to reconfigure your BIOS or press one key that will offer you to choose
-the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">In BIOS/CSM/Legacy mode</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>First screen while booting in BIOS mode</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
+the peripheral from which the computer will boot.</para></section></section><section xml:id="biosmode"><info><title xml:id="biosmode-ti1">En mode BIOS/CSM/Legacy</title></info><mediaobject><imageobject><imagedata fileref="../live-bootCSM.png"/></imageobject><caption><para>La primera pantalla de l'arrencada en mode BIOS</para></caption></mediaobject><para>In the middle menu, you have the choice between three actions:</para><itemizedlist><listitem><para>Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD
 or USB stick) without writing anything on the disk, so expect a very slow
 system. Once the boot is done, you can proceed to the installation on a hard
 disk.</para></listitem><listitem><para>Install Mageia: This choice will directly install Mageia on a hard disk.</para></listitem><listitem><para>Boot from hard disk: This choice allows to boot from hard disk, as usual,
@@ -20,8 +20,8 @@ server, select one of the installation sources available on the server with
 this option.</para></listitem><listitem><para>F5 - Driver. Yes or No. The system is aware about the presence of an
 optional disk with a driver update and will require its insertion during
 installation process.</para></listitem><listitem><para>F6 - Kernel options. This is a way to specify options according to your
-hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">In UEFI mode</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>First screen while booting on UEFI system from disk</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
+hardware and the drivers to use.</para></listitem></itemizedlist></section><section xml:id="uefimode"><info><title xml:id="uefimode-ti1">En mode UEFI</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/></imageobject><caption><para>La primera pantalla de l'arrencada en un sistema UEFI des del disc</para></caption></mediaobject><para>You have only the choice to run Mageia in Live mode (first choice)  or to
 process the installation (second choice).</para><para>If you booted from a USB stick, you get two supplemental lines which are a
 duplicata of the previous lines suffixed with "USB". You have to choose
 them.</para><para>In each case, the first steps will be the same to choose language, timezone
diff --git a/docs/installer/ca/diskdrake.xml b/docs/installer/ca/diskdrake.xml
index 85c45160..a035452e 100644
--- a/docs/installer/ca/diskdrake.xml
+++ b/docs/installer/ca/diskdrake.xml
@@ -44,8 +44,9 @@ punt de muntatge, redimensioneu-la, o bé elimineu-la.</para>
 System Partition) is present and correctly mounted on /boot/EFI (see below)</para>
 
     <para><mediaobject>
-<imageobject> <imagedata fileref="dx2-diskdrake2.png"/> </imageobject></mediaobject><mediaobject>
-<imageobject> <imagedata fileref="live-diskdrake2.png"/> </imageobject></mediaobject></para>
+<imageobject condition="classical"> <imagedata fileref="dx2-diskdrake2.png"
+align="center"/> </imageobject> <imageobject condition="live"> <imagedata
+fileref="live-diskdrake2.png" align="center"/> </imageobject></mediaobject></para>
   </note>
 
   <note>
@@ -53,8 +54,9 @@ System Partition) is present and correctly mounted on /boot/EFI (see below)</par
 partition is present with a correct type</para>
 
     <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks3.png"/>
-</imageobject> <imageobject> <imagedata
-fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks3.png" align="center"/> </imageobject></mediaobject>
   </note>
 </section>
\ No newline at end of file
diff --git a/docs/installer/ca/doPartitionDisks.xml b/docs/installer/ca/doPartitionDisks.xml
index 5ddc3f56..01550bf8 100644
--- a/docs/installer/ca/doPartitionDisks.xml
+++ b/docs/installer/ca/doPartitionDisks.xml
@@ -19,12 +19,10 @@ propostes de l'auxiliar de particionament de DrakX sobre on instal·lar
 disposició i contingut del(s) vostre(s) disc(s) dur(s) en particular.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks.png" align="center"/>
-</imageobject></mediaobject>
-
-  <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks.png" align="center"/> </imageobject></mediaobject>
 
   <para revision="1" xml:id="doPartitionDisks-pa3"><itemizedlist>
       <listitem>
@@ -65,12 +63,10 @@ sizes just under. You have the possibility to adapt these sizes by clicking
 and dragging the gap between both partitions. See the screen-shot below.</para>
 
         <mediaobject>
-<imageobject> <imagedata fileref="dx2-doPartitionDisks2.png"/>
-</imageobject></mediaobject>
-
-        <mediaobject>
-<imageobject> <imagedata fileref="live-doPartitionDisks2.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks2.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks2.png" align="center"/> </imageobject></mediaobject>
       </listitem>
     </itemizedlist> <itemizedlist>
       <listitem>
@@ -142,12 +138,10 @@ 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>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-doPartitionDisks3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
     <mediaobject>
 <imageobject> <imagedata fileref="dx2-doPartitionDisks4.png"/>
diff --git a/docs/installer/ca/reboot.xml b/docs/installer/ca/reboot.xml
index 8d9965c9..10d1a2a7 100644
--- a/docs/installer/ca/reboot.xml
+++ b/docs/installer/ca/reboot.xml
@@ -1,24 +1,18 @@
-<?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:lang="ca" xml:id="reboot">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" version="5.0" xml:lang="ca" xml:id="reboot">
   <!--Lebarhon 20170210 updated for Mageia6-->
 <info>
     <title xml:id="reboot-ti1">Reinicia</title>
   </info>
-
-
-
-
+  
   <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 fileref="live-reboot2.png"/> </imageobject></mediaobject>
-
-  <para>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 lists are being downloaded (see Software
 management).</para>
-
   <mediaobject condition="live">
 <imageobject> <imagedata format="PNG" xml:id="reboot-im1"
 fileref="live-reboot.png" align="center" revision="1"/> </imageobject></mediaobject>
diff --git a/docs/installer/ca/setupBootloader.xml b/docs/installer/ca/setupBootloader.xml
index 761c3987..88df597d 100644
--- a/docs/installer/ca/setupBootloader.xml
+++ b/docs/installer/ca/setupBootloader.xml
@@ -34,13 +34,12 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
       <title>Grub2 on Legacy/MBR and Legacy/GPT systems</title>
 
       <mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader.png"/> </imageobject></mediaobject>
-
-      <mediaobject>
-<imageobject> <imagedata xml:id="setupBootloader-im1"
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader.png" align="center"/> </imageobject>
+<imageobject condition="live"> <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>
+      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
     </section>
 
     <section>
@@ -50,21 +49,20 @@ fileref="live-setupBootloader.png"/> </imageobject></mediaobject>
 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>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader2.png"/> </imageobject></mediaobject>
 
-      <para>If Mageia is the first system installed on your computer, the installer
+      <para>If Mageia is the only system installed on your computer, the installer
 created an ESP (EFI System Partition) to receive the bootloader
-(Grub2-efi). If there 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>
+(Grub2-efi). If there are already UEFI operating systems installed on your
+computer (Windows 8 for example), the Mageia installer detects the existing
+ESP created by Windows and adds grub2-efi. Although it is possible to have
+several ESPs, only one is advised and enough whatever the number of
+operating systems you have.</para>
 
-      <para>Don't modify the "Boot Device" unless really knowing what you do.</para>
+      <para>Don't modify the "Boot Device" unless you really know what you are doing.</para>
     </section>
   </section>
 
@@ -90,11 +88,10 @@ click on <guibutton>Next</guibutton> and then uncheck the box
 <guilabel>Probe Foreign OS</guilabel></para>
 
     <mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader3.png"/> </imageobject></mediaobject>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader3.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader3.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader3.png" align="center"/> </imageobject></mediaobject>
   </section>
 
   <section>
@@ -108,22 +105,21 @@ del sistema operatiu corresponent.</para>
   </section>
 
   <section>
-    <title xml:id="setupChainLoading">Using the chain loading</title>
+    <title xml:id="setupChainLoading">Using chain loading</title>
 
-    <para>If you don't want a bootable Mageia, but chain load it from another OS,
+    <para>If you don't want a bootable Mageia, but to chain load it from another OS,
 click on <guibutton>Next</guibutton>, then on
 <guibutton>Advanced</guibutton> and Check the box <guilabel>Do not touch ESP
 or MBR</guilabel>.</para>
 
     <mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader4.png"/> </imageobject></mediaobject>
-
-    <mediaobject>
-<imageobject> <imagedata fileref="live-setupBootloader4.png"/>
-</imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader4.png" align="center"/> </imageobject>
+<imageobject condition="live"> <imagedata
+fileref="live-setupBootloader4.png" align="center"/> </imageobject></mediaobject>
 
-    <para>You will get a warning that the bootloader will lack, ignore it by a click
-on <guibutton>OK</guibutton>.</para>
+    <para>You will get a warning that the bootloader is missing, ignore it by clicking
+<guibutton>OK</guibutton>.</para>
 
     <mediaobject>
 <imageobject> <imagedata fileref="dx2-setupBootloader5.png"/> </imageobject></mediaobject>
@@ -165,10 +161,10 @@ check that it matches with the one set above.</para>
               <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>
+stopping unused devices, this was the method used before APM. Unchecking it
+could be useful if, for example, your computer does not support ACPI or if
+you think the ACPI implementation might cause some problems (for instance
+random reboots or system lockups).</para>
               </listitem>
 
               <listitem>
@@ -185,7 +181,7 @@ IRQ (Interrupt Request)  management.</para>
 
               <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>
+manages all external interrupts for a specific processor in an SMP system.</para>
               </listitem>
             </itemizedlist>
           </listitem>