Update XML

5 files changed, 45 insertions, 161 deletions

diff --git a/docs/installer/ca/bootLive.xml b/docs/installer/ca/bootLive.xml
index 653ff692..91f311b9 100644
--- a/docs/installer/ca/bootLive.xml
+++ b/docs/installer/ca/bootLive.xml
@@ -1,135 +1,29 @@
-<?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" 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">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,
 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
+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
 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">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
 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,
+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,
 when no media (CD/DVD or USB stick) is connected. (not working with Mageia
-5).</para>
-      </listitem>
-    </itemizedlist>
-
-    <para>In the bottom menu, are the Boot Options:</para>
-
-    <itemizedlist>
-      <listitem>
-        <para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para>
-      </listitem>
-
-      <listitem>
-        <para>F2 - Language. Choose the display language of the screens.</para>
-      </listitem>
-
-      <listitem>
-        <para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para>
-      </listitem>
-
-      <listitem>
-        <para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
+5).</para></listitem></itemizedlist><para>In the bottom menu, are the Boot Options:</para><itemizedlist><listitem><para>F1 - Help. Explain the options "splash", "apm", "acpi" and "Ide"</para></listitem><listitem><para>F2 - Language. Choose the display language of the screens.</para></listitem><listitem><para>F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728</para></listitem><listitem><para>F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from
 the inserted installation medium. Here, select other sources, like FTP or
 NFS servers. If the installation is carried out in a network with an SLP
 server, select one of the installation sources available on the server with
-this option.</para>
-      </listitem>
-
-      <listitem>
-        <para>F5 - Driver. Yes or No. The system is aware about the presence of an
+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 revision="1" align="center"
-fileref="live-bootUEFI.png" format="PNG" xml:id="bootUEFI-im1"/>
-</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
-process the installation (second choice).</para>
-    <para>If you booted from a USB stick, you get two supplemental lines which are a
+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
+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
+them.</para><para>In each case, the first steps will be the same to choose language, timezone
 and keyboard, then the processes differ, with <link
-linkend="testing">additional steps in Live mode</link>.</para>
-  </section>
-</section>
\ No newline at end of file
+linkend="testing">additional steps in Live mode</link>.</para></section></section>
\ No newline at end of file
diff --git a/docs/installer/ca/login.xml b/docs/installer/ca/login.xml
index f3572bb3..c5356bd4 100644
--- a/docs/installer/ca/login.xml
+++ b/docs/installer/ca/login.xml
@@ -1,24 +1,5 @@
-<?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" xml:id="login" version="5.0" xml:lang="ca">
-  <info>
-    <title xml:id="label-to-adapt-ti1">Login screen</title>
-  </info>
-
-  <mediaobject condition="live">
-    <imageobject> <imagedata revision="1" align="center" xml:id="login-im1"
-format="PNG" fileref="live-login.png"/> </imageobject>
-
-    <caption>
-      <para>KDM login screen</para>
-    </caption>
-  </mediaobject>
-
-  <para>Finally, you will come to the login screen.</para>
-
-  <para>Enter your user name and user password, and in a few seconds you will find
+<?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="login" version="5.0" xml:lang="ca"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1"
+fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will find
 yourself with a loaded KDE or GNOME desktop, depending on which live medium
-you used. You can now start using your Mageia installation.</para>
-
-  <para>You can find another part of our documentation in <link
-linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia
-wiki</link>.</para>
-</section>
\ No newline at end of file
+you used. You can now start using your Mageia installation.</para><para>Els podeu trobar <link
+linkend="https://wiki.mageia.org/en/Category:Documentation">aquí</link>.</para></section>
\ No newline at end of file
diff --git a/docs/installer/ca/setupBootloader.xml b/docs/installer/ca/setupBootloader.xml
index a9c85aad..5cd600a6 100644
--- a/docs/installer/ca/setupBootloader.xml
+++ b/docs/installer/ca/setupBootloader.xml
@@ -10,9 +10,11 @@
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1" align="center"
-fileref="dx2-setupBootloader.png" xml:id="setupBootloader-im1"
-format="PNG"/> </imageobject></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>
@@ -33,7 +35,7 @@ permetre a Mageia que en creï un de nou.</para>
         <title xml:id="usingMageiaBootloader-ti2">Ús del gestor d'arrencada de Mageia</title>
       </info>
 
-      <para revision="3" xml:id="setupBootloader-pa4">By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
+      <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>
@@ -42,7 +44,7 @@ boot menu.</para>
 l'antic GRUB i Lilo.</para>
 
       <warning>
-        <para revision="3" xml:id="setupBootloader-pa6">Linux systems which use the GRUB2 bootloader are not currently supported by
+        <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>
 
@@ -53,15 +55,15 @@ disponible a la pàgina de resum durant la instal·lació.</para>
 
     <section xml:id="usingExistingBootloader">
       <info>
-        <title revision="2" xml:id="usingExistingBootloader-ti4">Ús d'un gestor d'arrencada existent</title>
+        <title xml:id="usingExistingBootloader-ti4" revision="2">Ús d'un gestor d'arrencada existent</title>
       </info>
 
-      <para revision="3" xml:id="setupBootloader-pa46">Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de
+      <para xml:id="setupBootloader-pa46" revision="3">Si decidiu fer servir un gestor d'arrencada existent, llavors haureu de
 pensar a fer ATURA a la pàgina del resum durant la instal·lació, i fer clic
 el botó de <guibutton>Configuració</guibutton> del gestor d'arrencada, que
 us permetrà canviar-ne la localització.</para>
 
-      <para revision="1" xml:id="setupBootloader-pa47">Do not select a device e.g."sda", or you will overwrite your existing
+      <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>
 
@@ -73,7 +75,7 @@ on és la partició <literal>/</literal> (root). Ctrl+Alt+F7 us torna a la
 pantalla d'instal·lació.</para>
       </tip>
 
-      <para revision="2" xml:id="setupBootloader-pa49">El procediment exacte per a afegir Mageia a un gestor d'arrencada ja
+      <para xml:id="setupBootloader-pa49" revision="2">El procediment exacte per a afegir Mageia a un gestor d'arrencada ja
 existent està fora de l'abast d'aquesta ajuda, tot i que normalment
 implicarà executar el programa d'instal·lació del gestor d'arrencada en
 qüestió, que el detectarà i afegirà automàticament. Vegeu la documentació
@@ -82,10 +84,10 @@ del sistema operatiu corresponent.</para>
 
     <section xml:id="advancedOptionBootloader">
       <info>
-        <title revision="2" xml:id="advancedOptionBootloader-ti5">Opció avançada del gestor d'arrencada</title>
+        <title xml:id="advancedOptionBootloader-ti5" revision="2">Opció avançada del gestor d'arrencada</title>
       </info>
 
-      <para revision="3" xml:id="setupBootloader-pa52">Si l'espai de disc per a la partició <literal>/</literal> que conté
+      <para xml:id="setupBootloader-pa52" revision="3">Si l'espai de disc per a la partició <literal>/</literal> que conté
 <literal>/tmp</literal> és molt limitat, cliqueu a
 <guibutton>Avançat</guibutton> i marqueu la casella <guilabel>Neteja /tmp en
 cada arrencada</guilabel>. Això ajudarà a mantenir espai lliure.</para>
@@ -99,7 +101,10 @@ cada arrencada</guilabel>. Això ajudarà a mantenir espai lliure.</para>
 choose the boot loader since only Grub2-efi is available. </para>
 
     <mediaobject>
-<imageobject> <imagedata fileref="dx2-setupBootloader2.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata
+fileref="dx2-setupBootloader2.png"/> </imageobject> <imageobject
+condition="live"> <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
diff --git a/docs/installer/ca/setupBootloaderAddEntry.xml b/docs/installer/ca/setupBootloaderAddEntry.xml
index 03791c5d..15ceb44f 100644
--- a/docs/installer/ca/setupBootloaderAddEntry.xml
+++ b/docs/installer/ca/setupBootloaderAddEntry.xml
@@ -1,4 +1,4 @@
-<?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" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ca">
+<?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:lang="ca" xml:id="setupBootloaderAddEntry">
   
 
   <info>
@@ -7,9 +7,13 @@
   </info>
 
   <mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
-xml:id="bootloaderConfiguration-im1"/> </imageobject></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>
@@ -26,8 +30,8 @@ instead.</para>
     </note>
 
     <mediaobject>
-<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
-align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+<imageobject> <imagedata format="PNG" xml:id="setupBootloaderAddEntry-im1"
+align="center" fileref="dx2-setupBootloaderAddEntry.png" revision="1"/>
 </imageobject></mediaobject>
 
     <para>Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una
diff --git a/docs/installer/ca/unused.xml b/docs/installer/ca/unused.xml
index 2f1de8f8..59205b1e 100644
--- a/docs/installer/ca/unused.xml
+++ b/docs/installer/ca/unused.xml
@@ -19,7 +19,7 @@ accept, except if you prepare an installation which has to run on different
 hardware.</para>
 
   <mediaobject>
-<imageobject> <imagedata fileref="live-unused-InstallationProgress.png"/>
+<imageobject> <imagedata fileref="../live-unused-InstallationProgress.png"/>
 </imageobject></mediaobject>
 
   <para>The next step is the copying of files on hard disk. This takes some