Update translation catalog

3 files changed, 20 insertions, 127 deletions

diff --git a/docs/docs/stable/installer/en/DrakLive-cover.xml b/docs/docs/stable/installer/en/DrakLive-cover.xml
index 9545869e..4f279db3 100644
--- a/docs/docs/stable/installer/en/DrakLive-cover.xml
+++ b/docs/docs/stable/installer/en/DrakLive-cover.xml
@@ -1,82 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<book version="5.0" xml:id="DrakLive-installer"
-      xmlns="http://docbook.org/ns/docbook"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:ns6="http://www.w3.org/1999/xlink"
-      xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-      xmlns:ns4="http://www.w3.org/1999/xhtml"
-      xmlns:ns3="http://www.w3.org/2000/svg"
-      xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><book 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/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xml:id="DrakLive-installer" version="5.0">
   <!--2018/02/19 apb: Disabled setupBootloaderAddEntry.xml because I have included it at the end of setupBootloader.xml-->
-
   <!--2018/03/24 apb: Disabled doPartitionDisks.xml, ask_mntpoint_s.xml, takeOverHdConfirm.xml, diskdrake.xml and formatPartitions.xml because I have grouped them together under diskPartitioning.xml (as per DrakX)-->
-
   <info>
     <title>Installation from LIVE medium</title>
-
     <publisher>
       <publishername>Mageia.org</publishername>
     </publisher>
-
     <revhistory>
       <revision>
-        <date>March 2016</date>
-
-        <revremark>Mageia 5</revremark>
+        <date>05 December 2020</date>
+        <revremark>Mageia 8</revremark>
       </revision>
     </revhistory>
-
     <cover>
       <para role="tagline">The Official Documentation for Mageia</para>
-
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
-
       <para>The texts and screenshots in this manual are available under the
-      CC BY-SA 3.0 license <link
-      ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
-
-      <para>This manual was produced with the help of the <link
-      ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-      ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
-
+      CC BY-SA 3.0 license <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+      <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
       <para>It was written by volunteers in their free time. Please contact
-      <link
-      ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+      <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
       Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
-
   <article>
     <title>Installation from LIVE medium</title>
-
-    <para><note>
-        <para>No one will see all the installer screens that you see in this
+    <para><note><para>No one will see all the installer screens that you see in this
         manual. Which screens you will see, depends on your hardware and the
-        choices you make while installing.</para>
-      </note></para>
-
+        choices you make while installing.</para></note></para>
     <xi:include href="SelectAndUseISOs2.xml"/>
-
     <xi:include href="bootLive.xml"/>
-
     <xi:include href="selectLanguage.xml"/>
-
     <xi:include href="acceptLicense.xml"/>
-
     <xi:include href="configureTimezoneUTC.xml"/>
-
     <xi:include href="bestTime.xml"/>
-
     <xi:include href="selectKeyboardLive.xml"/>
-
     <xi:include href="testing.xml"/>
-
     <xi:include href="diskPartitioning.xml"/>
-
     <!-- <xi:include href="doPartitionDisks.xml"/>
 
     <xi:include href="ask_mntpoint_s.xml"/>
@@ -86,19 +50,12 @@
     <xi:include href="diskdrake.xml"/>
 
     <xi:include href="formatPartitions.xml"/> -->
-
     <xi:include href="unused.xml"/>
-
     <xi:include href="setupBootloader.xml"/>
-
     <!-- <xi:include href="setupBootloaderAddEntry.xml"/> -->
-
     <xi:include href="reboot.xml"/>
-
     <xi:include href="addUser.xml"/>
-
     <xi:include href="login.xml"/>
-
     <xi:include href="uninstall-Mageia.xml"/>
   </article>
-</book>
+</book>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/en/DrakLive.xml b/docs/docs/stable/installer/en/DrakLive.xml
index 125bb7c1..1f698ff3 100644
--- a/docs/docs/stable/installer/en/DrakLive.xml
+++ b/docs/docs/stable/installer/en/DrakLive.xml
@@ -65,9 +65,9 @@ b) Disabled doPartitionDisks.xml ask_mntpoint_s.xml takeOverHdConfirm.xml diskdr
 
   <xi:include href="diskdrake.xml"/>
 
-  <xi:include href="formatPartitions.xml"/>
+  <xi:include href="formatPartitions.xml"/> -->
 
-  <xi:include href="unused.xml"/> -->
+  <xi:include href="unused.xml"/>
 
   <xi:include href="setupBootloader.xml"/>
 
diff --git a/docs/docs/stable/installer/en/DrakX-cover.xml b/docs/docs/stable/installer/en/DrakX-cover.xml
index fb62cbc7..63c1b54a 100644
--- a/docs/docs/stable/installer/en/DrakX-cover.xml
+++ b/docs/docs/stable/installer/en/DrakX-cover.xml
@@ -1,92 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Converted by db4-upgrade version 1.0 -->
-<book version="5.0" xml:id="Quick-Startup"
-      xmlns="http://docbook.org/ns/docbook"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xmlns:ns62="http://docbook.org/ns/transclusion"
-      xmlns:ns6="http://www.w3.org/1999/xlink"
-      xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-      xmlns:ns4="http://www.w3.org/1999/xhtml"
-      xmlns:ns3="http://www.w3.org/2000/svg"
-      xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='UTF-8'?><book 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/xhtml" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns6="http://www.w3.org/1999/xlink" xmlns:ns62="http://docbook.org/ns/transclusion" xmlns:xi="http://www.w3.org/2001/XInclude" version="5.0" xml:id="Quick-Startup">
   <info>
     <title>Installation with DrakX</title>
-
     <publisher>
       <publishername>Mageia.org</publishername>
     </publisher>
-
     <revhistory>
       <revision>
-        <date>February 2014</date>
-
-        <revremark>Mageia 4</revremark>
+        <date>05 December 2020</date>
+        <revremark>Mageia 8</revremark>
       </revision>
     </revhistory>
-
     <cover>
       <para role="tagline">The Official Documentation for Mageia</para>
-
       <mediaobject>
         <imageobject>
           <imagedata fileref="../mageia-2013.png"/>
         </imageobject>
       </mediaobject>
-
       <para>The texts and screenshots in this manual are available under the
-      CC BY-SA 3.0 license <link
-      ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
-
-      <para>This manual was produced with the help of the <link
-      ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link
-      ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
-
+      CC BY-SA 3.0 license <link ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link>.</para>
+      <para>This manual was produced with the help of the <link ns6:href="http://www.calenco.com">Calenco CMS</link> developed by <link ns6:href="http://www.neodoc.biz">NeoDoc</link>.</para>
       <para>It was written by volunteers in their free time. Please contact
-      <link
-      ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
+      <link ns6:href="https://wiki.mageia.org/en/Documentation_team">Documentation
       Team</link>, if you would like to help improve this manual.</para>
     </cover>
   </info>
-
   <article>
     <!-- 2013-01-03 removed link to choosePackages.xml, because there is no link to it in installer. link to setupX has been removed for the same reason, before-->
-
     <!--2013-03-31 removed link to setupBootloaderBeginner.xml, because that page is no longer needed -->
-
     <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
-
     <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
-
     <!--2013-12-08 add soundConfig.xml -->
-
     <!--2019-01-12 apb: add graphicalConfiguration.xml to group the 3 configureX xml's. -->
-
     <title>Installation with DrakX</title>
-
-    <para><note>
-        <para>No one will see all the installer screens that you see in this
+    <para><note><para>No one will see all the installer screens that you see in this
         manual. Which screens you will see, depends on your hardware and the
-        choices you make while installing.</para>
-      </note></para>
-
+        choices you make while installing.</para></note></para>
     <!-- <xi:include href="drakx-intro.xml"/> -->
-
     <xi:include href="SelectAndUseISOs2.xml"/>
-
     <xi:include href="installer.xml"/>
-
     <xi:include href="selectLanguage.xml"/>
-
     <xi:include href="acceptLicense.xml"/>
-
     <xi:include href="setupSCSI.xml"/>
-
     <xi:include href="selectInstallClass.xml"/>
-
     <xi:include href="selectKeyboard.xml"/>
-
     <!-- <xi:include href="resizeFATChoose.xml"/> -->
-
     <!-- <xi:include href="doPartitionDisks.xml"/>
 
   <xi:include href="ask_mntpoint_s.xml"/>
@@ -98,7 +56,6 @@
   <xi:include href="diskdrake.xml"/>
 
   <xi:include href="formatPartitions.xml"/>-->
-
     <!-- <xi:include href="add_supplemental_media.xml"/>
 
   <xi:include href="media_selection.xml"/>
@@ -110,57 +67,36 @@
   <xi:include href="minimal-install.xml"/>
 
   <xi:include href="choosePackagesTree.xml"/> -->
-
     <xi:include href="diskPartitioning.xml"/>
-
     <xi:include href="software.xml"/>
-
     <!-- <xi:include href="setRootPassword.xml"></xi:include> -->
-
     <xi:include href="addUser.xml"/>
-
     <xi:include href="graphicalConfiguration.xml"/>
-
     <!-- <xi:include href="configureX_card_list.xml"/>
 
     <xi:include href="configureX_chooser.xml"/>
 
   <xi:include href="configureX_monitor.xml"/> -->
-
     <xi:include href="setupBootloader.xml"/>
-
     <!-- <xi:include href="setupBootloaderAddEntry.xml"/> -->
-
     <!-- <xi:include href="setupYabootGeneral.xml"></xi:include>
   
   <xi:include href="setupYabootAddEntry.xml"></xi:include>
   
   <xi:include href="summary.xml"></xi:include> -->
-
     <xi:include href="misc-params.xml"/>
-
     <xi:include href="locale.xml"/>
-
     <!-- <xi:include href="configureTimezoneUTC.xml"/>
 
   <xi:include href="selectCountry.xml"/> -->
-
     <xi:include href="configureServices.xml"/>
-
     <xi:include href="selectMouse.xml"/>
-
     <xi:include href="soundConfig.xml"/>
-
     <xi:include href="securityLevel.xml"/>
-
     <xi:include href="firewall.xml"/>
-
     <!-- <xi:include href="configureNetwork.xml"></xi:include> -->
-
     <xi:include href="installUpdates.xml"/>
-
     <xi:include href="exitInstall.xml"/>
-
     <xi:include href="uninstall-Mageia.xml"/>
   </article>
-</book>
+</book>
\ No newline at end of file