Update German translation

9 files changed, 217 insertions, 92 deletions

diff --git a/docs/docs/stable/installer/de/SelectAndUseISOs2.xml b/docs/docs/stable/installer/de/SelectAndUseISOs2.xml
index b094fe17..c7befcf7 100644
--- a/docs/docs/stable/installer/de/SelectAndUseISOs2.xml
+++ b/docs/docs/stable/installer/de/SelectAndUseISOs2.xml
@@ -360,7 +360,7 @@ size is 2GB:</para>
           <listitem>
             <para>Enter the command: <command>dd if=path/to/the/ISO/file
 of=/dev/sd<replaceable>X</replaceable> bs=1M</command></para>
-            <para>Where <replaceable>X</replaceable>=your device name eg:
+            <para>Where <replaceable>X</replaceable>=der Name Ihres Gerätes ist, z. B.:
 <filename>/dev/sdd</filename></para>
             <para>Example:<literal> dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
 of=/dev/sdd bs=1M</literal></para>
diff --git a/docs/docs/stable/installer/de/bootLive.xml b/docs/docs/stable/installer/de/bootLive.xml
index 45863ea7..cd823d24 100644
--- a/docs/docs/stable/installer/de/bootLive.xml
+++ b/docs/docs/stable/installer/de/bootLive.xml
@@ -1,23 +1,45 @@
-<?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="de">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="de" 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">
   
+
   
+
   
+
+  
+
+  
+
+  
+
   <info>
     <!--2018/03/01 apb: a) center-align live-bootCSM.png b) Redo/expand text.-->
 <!--2018/02/02 apb: a) update live-bootCSM.png and redo corresponding text.-->
 <!--2018/02/03 apb: a) A couple of typos and slight adjustment to some text. b) Added definition for F6 Default boot option.-->
+<!--2019/01/06 apb: 1.2 - F6 last sentence typo.-->
+<!--2019/01/06 apb: 1.2 - Update SC (live-bootCSM.png) and text to reflect changes to Mga7 options.-->
+<!--2019/01/08 apb: 1.2 - Add text for Memtest option. 1.3 - Update live-bootUEFI.png and add text for F2 Language option.-->
 <title xml:id="bootLive-ti1">Mageia als Live-System starten</title>
   </info>
+
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Vom Medium starten</title>
     </info>
+
     <para>You can boot directly from a Live DVD or USB. Usually, you just need to plug
 the USB device in or place the DVD in the drive and restart the computer.</para>
+
     <para>If the computer does not automatically boot from the USB or DVD you may need
 to reconfigure your BIOS Boot Disk priority. Alternatively, you might try
 accessing the boot device menu to select a device from which the computer
 will boot.</para>
+
     <tip>
       <para>To access the BIOS or boot menu when the computer is starting, you can try
 pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
@@ -26,140 +48,125 @@ pressing either <keycap>F2</keycap>, <keycap>Del</keycap> or
 boot device menu. These (fairly common) keys are just a selection of
 possible options though.</para>
     </tip>
+
     <note>
       <para>The actual screen that you will first see when booting from the Live media
 will depend on whether your computer motherboard is of the Legacy (BIOS) or
 UEFI type.</para>
     </note>
   </section>
+
   <section xml:id="biosmode">
     <info>
       <title xml:id="biosmode-ti1">Im BIOS/CSM/Legacy Modus</title>
     </info>
+
+    <mediaobject>
+      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+</imageobject>
+
+      <caption>
+        <para>Der erste Bildschirm beim starten im BIOS Modus</para>
+      </caption>
+    </mediaobject>
+
     <itemizedlist>
-      <title>Hauptmenü</title>
+      <title>Menü</title>
+
       <listitem>
         <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
         <para>This option will boot the Mageia Live system from the connected DVD/USB
 media (expect a very slow system compared to an installed OS).</para>
+
         <para>Once the boot is done, you can proceed to the installation.</para>
+
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ use non-free video drivers (slower to
 boot)</emphasis></para>
+
             <para>Boot the Mageia Live system using non-free video drivers</para>
           </listitem>
         </itemizedlist>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Install Mageia</emphasis></para>
+
         <para>This option will install Mageia to a hard disk.</para>
+
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ use non-free video drivers (slower to
 boot)</emphasis></para>
+
             <para>Install Mageia using non-free video drivers</para>
           </listitem>
         </itemizedlist>
       </listitem>
-    </itemizedlist>
-    <mediaobject>
-      <imageobject> <imagedata fileref="live-bootCSM.png" align="center"/>
-</imageobject>
-      <caption>
-        <para>Der erste Bildschirm beim starten im BIOS Modus</para>
-      </caption>
-    </mediaobject>
-    <itemizedlist>
-      <title>Funktionstasten</title>
+
       <listitem>
-        <para><keycap>F1</keycap> <emphasis role="bold">Hilfe</emphasis></para>
-        <para>Within any of the <keycap>F2</keycap> to <keycap>F6</keycap> options, you
-can view relevant help by pressing <keycap>F1</keycap>.</para>
+        <para><emphasis role="bold">Memory Test</emphasis></para>
+
+        <para>Test the installed RAM by performing multiple read and write
+operations. Reboot to end the test.</para>
       </listitem>
+
       <listitem>
-        <para><keycap>F2</keycap> <emphasis role="bold">Sprache</emphasis></para>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
         <para>Press <keycap>F2</keycap> to have the installer use a specific language
 during the installation. Use the arrow keys to select the language then
 press <keycap>Enter</keycap>.</para>
       </listitem>
-      <listitem>
-        <para><keycap>F3</keycap> <emphasis role="bold">Video Mode</emphasis></para>
-        <para>If needed, change the screen resolution by pressing
-<keycap>F3</keycap>. Options are: 640x480, 800x600, 1024x768.</para>
-      </listitem>
-      <listitem>
-        <para><keycap>F4</keycap> <emphasis role="bold">Source</emphasis></para>
-        <para>Normally, the installation is performed from the inserted installation
-medium. Here, you may select other sources, like FTP or NFS servers.</para>
-        <para>If the installation is carried out in a network with an SLP server, then
-select one of the installation sources available on the server with this
-option.</para>
-      </listitem>
-      <listitem>
-        <para><keycap>F5</keycap> <emphasis role="bold">Driver</emphasis></para>
-        <para>If you have a driver update that you wish to use, select this option and
-then answer <emphasis>Yes</emphasis>. You will be prompted to insert the
-update disc at the appropriate time.</para>
-      </listitem>
-      <listitem>
-        <para><keycap>F6</keycap> <emphasis role="bold">Kernel Options</emphasis></para>
-        <para>If you experience problems with the installation, you could try modifying
-the default settings using the <emphasis>Kernel Option</emphasis> menu:</para>
-        <itemizedlist>
-          <listitem>
-            <para><emphasis role="bold">Default:</emphasis> splash quiet noiswmd resume
-audit=0</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">Safe Settings:</emphasis> <literal>apm=off acpi=off
-mce=off barrier=off ide=nodma idewait=50 i8042.nomux psmouse.proto=bare
-irqpoll pci=nommconf</literal></para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">No ACPI:</emphasis> (Advanced Configuration and Power
-Interface): Power management features are not used.</para>
-          </listitem>
-          <listitem>
-            <para><emphasis role="bold">No Local APIC:</emphasis> (Local Advanced Programmable
-Interrupt Controller): CPU interrupt. Select this option if you experience
-system misbehaviour like a kernel panic in relation to APIC.</para>
-          </listitem>
-        </itemizedlist>
-        <para>If you open any of the above <keycap>F6</keycap> menu items, and then click
-on <keycap>F1</keycap>, an info window will open to show more details for
-that particular item:</para>
-      </listitem>
     </itemizedlist>
   </section>
+
   <section xml:id="uefimode">
     <info>
       <title xml:id="uefimode-ti1">Im UEFI-Modus</title>
     </info>
+
     <mediaobject condition="live">
-      <imageobject> <imagedata format="PNG" fileref="live-bootUEFI.png"
-align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
+      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
+format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
+
       <caption>
         <para>First screen while booting in UEFI mode</para>
       </caption>
     </mediaobject>
-    <para>In UEFI mode, you have just the two menu options to choose from:</para>
+
     <itemizedlist>
+      <title>Menü</title>
+
       <listitem>
         <para><emphasis role="bold">Boot Mageia</emphasis></para>
+
         <para>This option will boot the Mageia Live system from the connected Dvd/USB
-media (expect a very slow system compared to an installed OS). Once the boot
-is done, you can proceed to the installation</para>
+media (expect a very slow system compared to an installed OS).  Once the
+boot is done, you can proceed to the installation</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Install Mageia</emphasis></para>
+
         <para>This option will install Mageia to a hard disk.</para>
       </listitem>
+
+      <listitem>
+        <para><emphasis role="bold"> F2 Language</emphasis></para>
+
+        <para>Press <keycap>F2</keycap> to have the installer use a specific language
+during the installation. Use the arrow keys to select the language then
+press <keycap>Enter</keycap>.</para>
+      </listitem>
     </itemizedlist>
+
     <note>
       <para>If you booted from a USB stick, you will see the above menu options
 duplicated, and in this case, you should choose from the menu pair that will
 be suffixed with "USB".</para>
     </note>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/de/diskPartitioning.xml b/docs/docs/stable/installer/de/diskPartitioning.xml
new file mode 100644
index 00000000..c50de66a
--- /dev/null
+++ b/docs/docs/stable/installer/de/diskPartitioning.xml
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:ns="http://docbook.org/ns/docbook" xreflabel="Partitioning" xml:id="diskPartitioning" xml:lang="de" version="5.0" xml:lang="de">
+  
+
+  <!--2018/02/27 apb: Created this XML to group the Partitioning-related elements.-->
+<title>Partitionierung</title>
+
+  <xi:include href="doPartitionDisks.xml"/>
+
+  <xi:include href="ask_mntpoint_s.xml"/>
+
+  <xi:include href="takeOverHdConfirm.xml"/>
+
+  <xi:include href="diskdrake.xml"/>
+
+  <xi:include href="formatPartitions.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/de/installer.xml b/docs/docs/stable/installer/de/installer.xml
index 7331a498..6d4ed48c 100644
--- a/docs/docs/stable/installer/de/installer.xml
+++ b/docs/docs/stable/installer/de/installer.xml
@@ -1,13 +1,31 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1998/Math/MathML" version="5.0" xml:lang="de" xml:id="installer">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="de" xml:id="installer"
+         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">
   
+
   
+
   
+
   
+
   
+
   
+
   
+
   
+
   
+
+  
+
   <info>
     <!--2018/02/11 apb: Text and typography. F6 Default option needs to be better defined.-->
 <!--2018/02/17 apb: Removed instances of surplus para tags from before and after some itemizedlist tags. These were present in the import from Mga6 WS.
@@ -19,105 +37,141 @@
 <!--2018/02/25 apb: Split 1,1 Caution into 2 paras.-->
 <!--2018/02/27 apb: Fixed UEFI section nest level.-->
 <!--2018/03/16 apb: Fixed incorrect value for title installer-ti1 (leading to output error since last year in Documentation Workspace - and inherited here, when imported).-->
-<!--2019/01/02 apb: 2.2 Typo. 2.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/02 apb: 1.2 Typo. 1.2.1: Update dx-welcome.png (BIOS Welcome screen) to Mga7 and strip text for the options which have been removed from the Mga7 Welcome screen.-->
+<!--2019/01/08 apb: 1.2.2: Update dx-welcome2.png (UEFI Welcome screen) to Mga7 and add text for F2 Languages option.-->
 <title xml:id="installer-ti1">DrakX, das Mageia Installationsprogramm</title>
   </info>
+
   <para>Egal, ob Sie ein neuer oder ein erfahrener GNU/Linux-Anwender sind, das
 Mageia Installationsprogramm wurde so gestaltet, dass es Ihnen die
 Installation oder eine Aktualisierung so leicht wie möglich macht.</para>
+
   <section>
     <title>Die Installationsschritte</title>
+
     <itemizedlist>
       <listitem>
         <para>The install process is divided into a number of steps - the status of which
 is indicated in a panel to the left of the screen.</para>
       </listitem>
+
       <listitem>
         <para>Each step has one or more screens, which may also have
 <emphasis>Advanced</emphasis> sections with extra, less commonly required
 options.</para>
       </listitem>
+
       <listitem>
         <para>Most screens have <emphasis>Help</emphasis> buttons for further details
 about the particular step.</para>
       </listitem>
     </itemizedlist>
+
     <caution>
       <para>If at some point during the install you decide to abort the installation, it
 is possible to reboot, but please think twice before you do this. Once a
 partition has been formatted or updates have started to be installed, your
 computer is no longer in the same state and rebooting it could very well
 leave you with an unusable system.</para>
+
       <para>If, in spite of this, you are very sure rebooting is what you want, go to a
-text terminal by pressing the keys
-<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>F2</keycap></keycombo>
-together. After that, press
-<keycombo><keycap>Ctrl</keycap><keycap>Alt</keycap><keycap>Delete</keycap></keycombo>
-together to reboot.</para>
+text terminal by pressing the keys <keycombo> <keycap>Ctrl</keycap>
+<keycap>Alt</keycap> <keycap>F2</keycap> </keycombo> together. After that,
+press <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap>
+<keycap>Delete</keycap> </keycombo> together to reboot.</para>
     </caution>
   </section>
+
   <section>
     <title>Willkommensbildschirm der Installation</title>
+
     <para>The particular screen that you will first see when booting from the
 Installation media will depend on whether your computer motherboard is of
 the Legacy (BIOS) or UEFI type.</para>
+
     <para>The welcome menu screen has various options, however the default option will
 start the installer, and is normally all that you will need.</para>
+
     <section>
-      <title>Legacy (BIOS) Systems</title>
+      <title>Legacy (BIOS) Systeme</title>
+
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx-welcome.png"/>
 </imageobject></mediaobject>
+
       <itemizedlist>
-        <title>Menu</title>
+        <title>Menü</title>
+
         <listitem>
           <para><emphasis role="bold">Install Mageia</emphasis></para>
+
           <para>Install Mageia to a hard disk. This is the default option, and will
 automatically start after a short while unless another option is selected.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Rescue System</emphasis></para>
+
           <para>This option allows you to either re-install the bootloader for an existing
 Mageia installation or you can use it to restore a Windows bootloader.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Memory Test</emphasis></para>
+
           <para>Test the installed RAM by performing multiple read and write
 operations. Reboot to end the test.</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">F2: Sprache</emphasis></para>
+
           <para>Drücke F2 für weitere Sprachen.</para>
         </listitem>
       </itemizedlist>
     </section>
+
     <section>
       <title>UEFI-Systeme</title>
+
       <para>From this screen, you can access options by pressing <keycap>e</keycap> to
 enter the edit mode. To come back to this screen, press <keycap>Esc</keycap>
 to quit without saving or press <keycap>F10</keycap> to save and quit.</para>
+
       <mediaobject>
-<imageobject> <imagedata fileref="dx-welcome2.png" align="center"/>
+<imageobject> <imagedata align="center" fileref="dx-welcome2.png"/>
 </imageobject></mediaobject>
-      <para>In UEFI mode you have only two menu options to choose from:</para>
+
       <itemizedlist>
+        <title>Menü</title>
+
         <listitem>
           <para><emphasis role="bold">Install:</emphasis> Start the Install process</para>
         </listitem>
+
         <listitem>
           <para><emphasis role="bold">Rescue:</emphasis> This option allows you to either
 re-install the bootloader for an existing Mageia installation or you can use
 it to restore a Windows bootloader.</para>
         </listitem>
+
+        <listitem>
+          <para><emphasis role="bold">F2: Sprache:</emphasis> Drücke <keycap>F2</keycap> für
+weitere Sprachen</para>
+        </listitem>
       </itemizedlist>
+
       <para>If you booted from a USB stick, you will see the above options duplicated,
 and in this case, you should use the set that will be suffixed with "USB".</para>
     </section>
   </section>
+
   <section>
     <title>Installationsprobleme und mögliche Lösungen</title>
+
     <section>
       <title>Keine grafische Schnittstelle</title>
+
       <itemizedlist>
         <listitem>
           <para>After the initial screen you did not progress to the <emphasis>Language
@@ -125,6 +179,7 @@ Selection</emphasis> screen. This can happen with some graphic cards and
 older systems. Try using low resolution by typing <command>vgalo</command>
 at the prompt.</para>
         </listitem>
+
         <listitem>
           <para>If the hardware is very old, a graphical installation may not be
 possible. In this case it is worth trying a text-mode installation. To use
@@ -136,24 +191,30 @@ mode.</para>
         </listitem>
       </itemizedlist>
     </section>
+
     <section>
       <title>Die Installation friert ein</title>
+
       <para>If the system appeared to freeze during the installation, this may be a
 problem with hardware detection. In this case the automatic hardware
 detection may be bypassed and dealt with later. To try this, type
 <command>noauto</command> at the prompt. This option may also be combined
 with other parameters as necessary.</para>
     </section>
+
     <section>
       <title>RAM Problem</title>
+
       <para>This will rarely be needed, but in some cases the hardware may report the
 available RAM incorrectly. To specify this manually, you can use the
 <literal>mem=<replaceable>xxx</replaceable>M</literal> parameter, where
 <replaceable>xxx</replaceable> is the correct amount of
 RAM. e.g. <literal>mem=256M</literal> would specify 256MB of RAM.</para>
     </section>
+
     <section>
       <title>Dynamische Partitionen</title>
+
       <para>If you converted your hard disk from <literal>Basic</literal> format to
 <literal>Dynamic</literal> format in Microsoft Windows, then it is not
 possible to install Mageia on this disc. To revert to a
@@ -161,4 +222,4 @@ possible to install Mageia on this disc. To revert to a
 ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
     </section>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/de/locale.xml b/docs/docs/stable/installer/de/locale.xml
new file mode 100644
index 00000000..adfdbd35
--- /dev/null
+++ b/docs/docs/stable/installer/de/locale.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="de" xml:id="locale" xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         xmlns:svg="http://www.w3.org/2000/svg"
+         xmlns:m="http://www.w3.org/1998/Math/MathML"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns:db="http://docbook.org/ns/docbook">
+  <title>Locale</title>
+
+  <xi:include href="configureTimezoneUTC.xml"/>
+
+  <xi:include href="selectCountry.xml"/>
+</section>
diff --git a/docs/docs/stable/installer/de/login.xml b/docs/docs/stable/installer/de/login.xml
index 4f42be5e..d933b00b 100644
--- a/docs/docs/stable/installer/de/login.xml
+++ b/docs/docs/stable/installer/de/login.xml
@@ -8,7 +8,7 @@
     <imageobject> <imagedata format="PNG" xml:id="login-im1"
 fileref="live-login.png" align="center" revision="1"/> </imageobject>
     <caption>
-      <para>SDDM login screen</para>
+      <para>SDDM Anmeldebildschirm</para>
     </caption>
   </mediaobject>
   <para>Finally, you will come to the desktop login screen.</para>
diff --git a/docs/docs/stable/installer/de/setupBootloader.xml b/docs/docs/stable/installer/de/setupBootloader.xml
index 27e7f966..4c52b99a 100644
--- a/docs/docs/stable/installer/de/setupBootloader.xml
+++ b/docs/docs/stable/installer/de/setupBootloader.xml
@@ -18,7 +18,7 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
   <section>
     <title>GRUB2</title>
     <itemizedlist>
-      <title>Grub2 on Legacy MBR/GPT systems</title>
+      <title>GRUB2 auf Legacy MBR/GPT Systeme</title>
       <listitem>
         <para>GRUB2 (with or without graphical menu) will be used exclusively as the
 bootloader for a Legacy/MBR or Legacy/GPT system.</para>
diff --git a/docs/docs/stable/installer/de/software.xml b/docs/docs/stable/installer/de/software.xml
new file mode 100644
index 00000000..2421a76d
--- /dev/null
+++ b/docs/docs/stable/installer/de/software.xml
@@ -0,0 +1,22 @@
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:db="http://docbook.org/ns/docbook" xml:id="software" version="5.0" xml:lang="de" xreflabel="Software">
+  
+
+  <!--2018/02/27 apb: Created this XML to gather together the XML's which can make up a Software group.-->
+<title>Software</title>
+
+  <section>
+    <title>Auswahl der Installationsmedien</title>
+
+    <xi:include href="add_supplemental_media.xml"/>
+
+    <xi:include href="media_selection.xml"/>
+  </section>
+
+  <xi:include href="chooseDesktop.xml"/>
+
+  <xi:include href="choosePackageGroups.xml"/>
+
+  <xi:include href="minimal-install.xml"/>
+
+  <xi:include href="choosePackagesTree.xml"/>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/de/testing.xml b/docs/docs/stable/installer/de/testing.xml
index 14127113..595f66bc 100644
--- a/docs/docs/stable/installer/de/testing.xml
+++ b/docs/docs/stable/installer/de/testing.xml
@@ -1,6 +1,15 @@
-<?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="de" xml:id="testing">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="de" xml:id="testing" 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">
+  
+
   <info>
-    <title xml:id="testing-ti1">Mageia als Live-System testen</title>
+    <!--2019/01/06 apb: 1.1.1 Remove empty 'webcam:' description relating to MCC/Hardware (and it is not an item there anyway).-->
+<title xml:id="testing-ti1">Mageia als Live-System testen</title>
   </info>
 
   <section xml:id="testing-1">
@@ -33,10 +42,6 @@ the Hardware section of the Mageia Control Center:</para>
         </listitem>
 
         <listitem>
-          <para>Webcam:</para>
-        </listitem>
-
-        <listitem>
           <para>Sound: Ein Sound wurde bereits abgespielt</para>
         </listitem>
 
@@ -73,4 +78,4 @@ linkend="doPartitionDisks">Partitioning</link> step.</para>
 </imageobject></mediaobject>
     </section>
   </section>
-</section>
\ No newline at end of file
+</section>