Update Swedish translation

12 files changed, 294 insertions, 231 deletions

diff --git a/docs/docs/stable/installer/sv.po b/docs/docs/stable/installer/sv.po
index b1df31e1..4ccb6d46 100644
--- a/docs/docs/stable/installer/sv.po
+++ b/docs/docs/stable/installer/sv.po
@@ -7,15 +7,15 @@
 # Kristoffer Grundström <hamnisdude@gmail.com>, 2013
 # Kristoffer Grundström <hamnisdude@gmail.com>, 2019
 # Kristoffer Grundström <hamnisdude@gmail.com>, 2013-2016,2018
-# Michael Eklund <willard@null.net>, 2014-2017
+# Michael Eklund <willard@null.net>, 2014-2017,2019
 # Yuri Chornoivan <yurchor@ukr.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
 "POT-Creation-Date: 2019-09-08 15:58+0300\n"
-"PO-Revision-Date: 2019-03-03 04:51+0000\n"
-"Last-Translator: Kristoffer Grundström <hamnisdude@gmail.com>\n"
+"PO-Revision-Date: 2019-10-15 20:43+0000\n"
+"Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
 "sv/)\n"
 "Language: sv\n"
@@ -54,7 +54,7 @@ msgstr "Licensavtal"
 msgid ""
 "Before installing Mageia, please read the license terms and conditions "
 "carefully."
-msgstr ""
+msgstr "Läs igenom licensvillkoren ordentligt innan du installerar Mageia."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/acceptLicense.xml:56
@@ -62,6 +62,8 @@ msgid ""
 "These terms and conditions apply to the entire Mageia distribution and must "
 "be accepted before you can continue."
 msgstr ""
+"Villkoren gäller hela Mageias distribution, och måste accepteras innan du "
+"kan fortsätta."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/acceptLicense.xml:61
@@ -166,17 +168,12 @@ msgstr "Användarhantering"
 #. 2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:28
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-setRootPassword.png\" format=\"PNG\" revision=\"1\" xml:id="
 "\"setRootPassword-im1\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-user1.png\" format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
-"\"dx2-setRootPassword.png\" align=\"center\" revision=\"1\" xml:id="
-"\"setRootPassword-im1\"/> </imageobject> <imageobject> <imagedata format="
-"\"PNG\" fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:40
@@ -505,13 +502,10 @@ msgstr "I BIOS/CSM/Legacy-läge"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:42
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-bootCSM.png\" align=\"center\"/> "
 "</imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-summaryTop.png\" align=\"center\"/> </"
-"imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:46
@@ -602,13 +596,10 @@ msgstr "I UEFI-läge"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:96
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata format=\"PNG\" xml:id=\"reboot-im1\" fileref=\"live-"
-"reboot.png\" align=\"center\" revision=\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:100
@@ -938,9 +929,8 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/configureX_chooser.xml:23
-#, fuzzy
 msgid "Graphics Card and Monitor Configuration"
-msgstr "Konfigurera grafikkort och bildskärm"
+msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/configureX_chooser.xml:28
@@ -973,9 +963,8 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:46
-#, fuzzy
 msgid "<emphasis role=\"bold\">Graphics Card</emphasis>"
-msgstr "<emphasis role=\"bold\">Grafikkort</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:49
@@ -1120,13 +1109,10 @@ msgstr ""
 
 #. type: Content of: <section><variablelist><varlistentry><listitem><para>
 #: en/configureX_monitor.xml:81
-#, fuzzy
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can choose it from the options by selecting:"
 msgstr ""
-"Om installationen inte har upptäckt din bildskärm och du vet vilken du har "
-"så kan du välja den från trädet genom att välja:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_monitor.xml:90
@@ -1391,18 +1377,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><important><para>
 #: en/doPartitionDisks.xml:103
-#, fuzzy
 msgid ""
 "The partition must be \"clean\", meaning that Windows must have closed down "
 "correctly the last time it was used. It must also have been defragmented, "
 "although this is not a guarantee that all files in the partition have been "
 "moved out of the area that is about to be used for Mageia."
 msgstr ""
-"Observera att det innebär att storleken på Windows-partitionen krymps. "
-"Partitionen måste vara \"ren\", dvs. att Windows måste ha stängts av korrekt "
-"när det användes sist. Den måste också ha defragmenterats, även om det inte "
-"är någon garanti för att filerna har flyttats bort ifrån ytan som kommer att "
-"användas. Du rekommenderas starkt att säkerhetskopiera dina personliga filer."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:112
@@ -1525,17 +1505,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:216
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-doPartitionDisks4.png\"/> </imageobject> <imageobject condition=\"live"
 "\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
 
 #. type: Content of: <section><important><para>
 #: en/doPartitionDisks.xml:226
@@ -1754,13 +1729,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/firewall.xml:26
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-firewall.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome.png\"/> </"
-"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:31
@@ -1798,9 +1770,8 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/firewall.xml:50
-#, fuzzy
 msgid "<emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis>"
-msgstr "<emphasis>&lt;portnummer>/&lt;protokoll></emphasis>"
+msgstr ""
 
 #. type: Content of: <section><simplelist><member>
 #: en/firewall.xml:53
@@ -3843,9 +3814,8 @@ msgstr "Starthanterare"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloader.xml:36
-#, fuzzy
 msgid "Available Bootloaders"
-msgstr "Starthanterare"
+msgstr ""
 
 #. type: Content of: <section><section><section><title>
 #: en/setupBootloader.xml:39
@@ -3854,9 +3824,8 @@ msgstr "Grub2"
 
 #. type: Content of: <section><section><section><itemizedlist><para>
 #: en/setupBootloader.xml:42
-#, fuzzy
 msgid "<emphasis role=\"bold\">Grub2 on Legacy MBR/GPT systems</emphasis>"
-msgstr "<emphasis role=\"bold\">Minnestest</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:46
@@ -3874,9 +3843,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><para>
 #: en/setupBootloader.xml:59
-#, fuzzy
 msgid "<emphasis role=\"bold\">Grub2-efi on UEFI systems</emphasis>"
-msgstr "<emphasis role=\"bold\">Prova</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:63
@@ -3907,9 +3875,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><para>
 #: en/setupBootloader.xml:85
-#, fuzzy
 msgid "<emphasis role=\"bold\">rEFInd on UEFI systems</emphasis>"
-msgstr "<emphasis role=\"bold\">Ikon</emphasis>"
+msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:88
@@ -3978,9 +3945,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><warning><para>
 #: en/setupBootloader.xml:147
-#, fuzzy
 msgid "Don't change this unless you really know what you are doing."
-msgstr "Ändra inte på det här om du inte vet vad du gör"
+msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><note><para>
 #: en/setupBootloader.xml:152
@@ -4115,23 +4081,17 @@ msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/setupBootloader.xml:243
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"rEFIndLoaderConfig.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata align=\"center\" fileref=\"live-rEFIndLoaderConfig.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
-"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
 
 #. type: Content of: <section><section><section><itemizedlist><para>
 #: en/setupBootloader.xml:253
-#, fuzzy
 msgid "Your rEFInd configuration options:"
-msgstr "Ljudkonfiguration"
+msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/setupBootloader.xml:256
@@ -4635,27 +4595,3 @@ msgid ""
 "take a little while to complete. When it is finishing you will briefly get a "
 "blank screen - this is normal."
 msgstr ""
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
-#~ "</imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootCSM.png\"/> "
-#~ "</imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"live-bootUEFI.png\" "
-#~ "format=\"PNG\" revision=\"1\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
-
-#~ msgid ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
-#~ "png\"/> </imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks4."
-#~ "png\"/> </imageobject>"
-
-#~ msgid "Grub2-efi on UEFI systems"
-#~ msgstr "Grub2-efi för ett UEFI-system."
diff --git a/docs/docs/stable/installer/sv/acceptLicense.xml b/docs/docs/stable/installer/sv/acceptLicense.xml
index d646ebc2..44dba5e7 100644
--- a/docs/docs/stable/installer/sv/acceptLicense.xml
+++ b/docs/docs/stable/installer/sv/acceptLicense.xml
@@ -57,13 +57,12 @@ align="center" condition="live"/> </imageobject></mediaobject>
 
     <itemizedlist>
       <listitem>
-        <para>Before installing Mageia, please read the license terms and conditions
-carefully.</para>
+        <para>Läs igenom licensvillkoren ordentligt innan du installerar Mageia.</para>
       </listitem>
 
       <listitem>
-        <para>These terms and conditions apply to the entire Mageia distribution and must
-be accepted before you can continue.</para>
+        <para>Villkoren gäller hela Mageias distribution, och måste accepteras innan du
+kan fortsätta.</para>
       </listitem>
 
       <listitem>
diff --git a/docs/docs/stable/installer/sv/addUser.xml b/docs/docs/stable/installer/sv/addUser.xml
index d1405561..800109e2 100644
--- a/docs/docs/stable/installer/sv/addUser.xml
+++ b/docs/docs/stable/installer/sv/addUser.xml
@@ -1,12 +1,28 @@
-<?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="sv" xml:id="addUser">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xml:id="addUser" 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">
   <info>
     <title xml:id="addUser-ti1">Användarhantering</title>
   </info>
+
   
+
   
+
   
+
   
+
   
+
+  
+
+  
+
   <mediaobject>
 <!-- Lebarhon: 20170210 updated for Mageia 6 (umask)-->
 <!--2018/02/12 apb: Text and Typography.-->
@@ -14,47 +30,63 @@
 <!--2018/02/21 apb: Changed title from 'User and Superuser Management' to 'User Management'. Docteam approved (plus, the SC title is User Management).
   Also changed 'Advanced User Management' to 'User Management (advanced)'.-->
 <!--2018/02/24 apb: Changed list style.-->
-<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>
+<!--2019/08/10 apb: Added missing 'condition' profile for live-user1.png.-->
+<!--2019/08/11 apb: [1] Reword 1.1 (including Note) [2] Reword 1.2 Password text.-->
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-setRootPassword.png" format="PNG" revision="1"
+xml:id="setRootPassword-im1"/> </imageobject> <imageobject condition="live">
+<imagedata fileref="live-user1.png" format="PNG"/> </imageobject></mediaobject>
+
   <section xml:id="root-password">
     <info>
       <title xml:id="root-password-ti2">Ställ in ett administratörs  (root) -lösenord:</title>
     </info>
+
     <para>It is advisable for all Mageia installations to set a
 <literal>superuser</literal> (Administrator) password, usually called the
-<emphasis>root </emphasis>password in Linux. As you type a password into the
-top box a shield will change from red-to-yellow-to-green depending on the
-strength of the password. A green shield shows you are using a strong
-password. You need to repeat the same password in the box underneath, to
-check that the first entry was not mistyped.</para>
+<emphasis>root </emphasis>password in Linux. You need to repeat the same
+password in the box underneath, to check that the first entry was not
+mistyped.</para>
+
     <note xml:id="givePassword">
+      <para>As you type a password into the top box a shield will change from
+red-to-yellow-to-green depending on the strength of the password. A green
+shield shows you are using a strong password.</para>
+
       <para>All passwords are case-sensitive. It is best to use a mixture of letters
 (upper and lower case), numbers and other characters in a password.</para>
     </note>
   </section>
+
   <section xml:id="enterUser">
     <info>
       <title xml:id="enterUser-ti3">Lägg till en användare</title>
     </info>
+
     <para>Add a User here. A regular user has fewer privileges than the
 <literal>superuser</literal> (root), but enough to use the Internet, office
 applications or play games and anything else the average user might use a
 computer for.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis role="bold">Ikon</emphasis></para>
+
         <para>Klicka på den här knappen om du vill ändra på användarens ikon</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Fullständigt namn</emphasis></para>
+
         <para>Klistra in användarens riktiga namn i den här textrutan</para>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Inloggningsnamn</emphasis></para>
+
         <para>Enter the user login name or let DrakX use a version of the user's real
 name. <emphasis role="bold">The login name is case-sensitive.</emphasis></para>
+
         <caution condition="live">
           <simpara>The login entered here should be different to any login currently in use for
 your <filename>/home</filename> directory. Some user parameters will be
@@ -62,45 +94,54 @@ written in the user space, and some can overwrite actual data such as
 Firefox, Thunderbird or Kmail data...</simpara>
         </caution>
       </listitem>
+
       <listitem>
         <para><emphasis role="bold">Lösenord</emphasis></para>
-        <para>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>
+
+        <para>Type in the user password (remembering the advice in the Note above).</para>
+
         <para><emphasis role="bold">Password (again):</emphasis> Retype the user
 password. DrakX will check that you have not mistyped the password.</para>
       </listitem>
     </itemizedlist>
+
     <note>
       <para>Any users added while installing Mageia, will have a home directory that is
 both read and write protected (umask=0027)</para>
+
       <para>You can add any extra needed users in the <emphasis>Configuration -
 Summary</emphasis> step during the install. Choose <emphasis>User
 management</emphasis>.</para>
+
       <para>Rättigheterna för åtkomst kan också ändras efter installationen.</para>
     </note>
   </section>
-  <section xml:id="addUserAdvanced" condition="classical">
+
+  <section condition="classical" xml:id="addUserAdvanced">
     <info>
       <title xml:id="addUserAdvanced-ti3">Användarhantering (avancerad)</title>
     </info>
+
     <para>The <emphasis>Advanced</emphasis> option allows you to edit further settings
 for the user you are adding.</para>
+
     <itemizedlist>
       <listitem>
         <para><emphasis>Shell</emphasis>: This drop-down list allows you to change the
 shell available to any user you added in the previous screen. Options are
 <literal>Bash</literal>, <literal>Dash</literal> and <literal>Sh</literal></para>
       </listitem>
+
       <listitem>
         <para><emphasis>User ID</emphasis>: Here you can set the user ID for any user you
 added in the previous screen. If you are unsure what the purpose of this is,
 then leave it blank.</para>
       </listitem>
+
       <listitem>
         <para><emphasis>Group ID</emphasis>: This lets you set the group ID.  Again, if
 unsure, leave it blank.</para>
       </listitem>
     </itemizedlist>
   </section>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/bootLive.xml b/docs/docs/stable/installer/sv/bootLive.xml
index 4456d6d3..0a453ce5 100644
--- a/docs/docs/stable/installer/sv/bootLive.xml
+++ b/docs/docs/stable/installer/sv/bootLive.xml
@@ -1,24 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns6="http://www.w3.org/1999/xlink"
-         xmlns:ns5="http://www.w3.org/1999/xhtml"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns: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="sv">
   
-
   
-
   
-
   
-
   
-
   
-
   
-
   <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.-->
@@ -30,20 +17,16 @@
  DVD.-->
 <title xml:id="bootLive-ti1">Starta Mageia som ett Live-system</title>
   </info>
-
   <section xml:id="bootLive-1">
     <info>
       <title xml:id="bootLive1-ti1">Startar upp mediat</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
@@ -52,125 +35,96 @@ 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">I BIOS/CSM/Legacy-läge</title>
     </info>
-
     <mediaobject>
-      <imageobject> <imagedata align="center" fileref="live-bootCSM.png"/>
+      <imageobject> <imagedata fileref="../live-bootCSM.png" align="center"/>
 </imageobject>
-
       <caption>
         <para>Den första skärmen när du startar i BIOS-läge</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Meny</title>
-
       <listitem>
         <para><emphasis role="bold">Starta 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">+ använd icke-fria grafik-drivrutiner (startar
 långsammare)</emphasis></para>
-
             <para>Starta Mageia Live-systemet med icke-fria grafik-drivrutiner</para>
           </listitem>
         </itemizedlist>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Installera Mageia</emphasis></para>
-
         <para>Det här alternativet kommer att installera Mageia till en hårddisk.</para>
-
         <itemizedlist>
           <listitem>
             <para><emphasis role="bold">+ använd icke-fria grafik-drivrutiner (startar
 långsammare)</emphasis></para>
-
             <para>Installera Mageia med icke-fria grafik-drivrutiner</para>
           </listitem>
         </itemizedlist>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Minnestest</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 Språk</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>
   </section>
-
   <section xml:id="uefimode">
     <info>
       <title xml:id="uefimode-ti1">I UEFI-läge</title>
     </info>
-
     <mediaobject condition="live">
-      <imageobject> <imagedata align="center" fileref="live-bootUEFI.png"
-format="PNG" revision="1" xml:id="bootUEFI-im1"/> </imageobject>
-
+      <imageobject> <imagedata format="PNG" fileref="../live-bootUEFI.png"
+align="center" xml:id="bootUEFI-im1" revision="1"/> </imageobject>
       <caption>
         <para>First screen while booting in UEFI mode</para>
       </caption>
     </mediaobject>
-
     <itemizedlist>
       <title>Meny</title>
-
       <listitem>
         <para><emphasis role="bold">Starta 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>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold">Installera Mageia</emphasis></para>
-
         <para>Det här alternativet kommer att installera Mageia till en hårddisk.</para>
       </listitem>
-
       <listitem>
         <para><emphasis role="bold"> F2 Språk</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>
+</section>
\ No newline at end of file
diff --git a/docs/docs/stable/installer/sv/configureX_card_list.xml b/docs/docs/stable/installer/sv/configureX_card_list.xml
index d466726c..48550dba 100644
--- a/docs/docs/stable/installer/sv/configureX_card_list.xml
+++ b/docs/docs/stable/installer/sv/configureX_card_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" xml:id="configureX_card_list"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sv"
+         xreflabel="Choose an X Server (Configure your Graphic Card)"
+         xml:id="configureX_card_list" xmlns="http://docbook.org/ns/docbook"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns4="http://www.w3.org/1998/Math/MathML"
          xmlns:ns3="http://www.w3.org/2000/svg"
@@ -20,6 +21,8 @@
 
   
 
+  
+
   <info>
     <!-- Initiated by Marja  2012-08-08 -->
 <!-- Further text JohnR  2012-08-29 -->
@@ -28,6 +31,7 @@
 <!-- Done corrections accordind to tmb remarks. Papoteur  -->
 <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/21 apb: Merge last 2 paras + slight reword.-->
+<!--2019/08/10 apb: Added xreflabel-->
 <title xml:id="configureX_card_list-ti1">Välj en X-server (konfigurera ditt grafikkort)</title>
   </info>
 
diff --git a/docs/docs/stable/installer/sv/configureX_chooser.xml b/docs/docs/stable/installer/sv/configureX_chooser.xml
index ba53d2ca..37da5148 100644
--- a/docs/docs/stable/installer/sv/configureX_chooser.xml
+++ b/docs/docs/stable/installer/sv/configureX_chooser.xml
@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" xml:id="configureX_chooser"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sv" xreflabel="Graphics Card and Monitor Configuration"
+         xml:id="configureX_chooser" xmlns="http://docbook.org/ns/docbook"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          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">
-  <info>
-    <title xml:id="configureX_chooser-ti1">Konfigurera grafikkort och bildskärm</title>
-  </info>
+  
 
   
 
@@ -21,12 +19,17 @@
 
   
 
-  <mediaobject>
-<!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
+  <info>
+    <!-- Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page-->
 <!--2018/02/15 apb: Some text and typography.-->
 <!--2018/02/21 apb: a) Changed main options list style. b) Slight reword of 'wrong refresh rates' warning.-->
 <!--2018/02/23 apb: Typo.-->
 <!--2019/01/06 apb: Slight reword, split 1st para in two.-->
+<!--2019/08/10 apb: [1] Added xreflabel. [2] Changed all instances of 'Graphic Card' to Graphics Card-->
+<title xml:id="configureX_chooser-ti1">Graphics Card and Monitor Configuration</title>
+  </info>
+
+  <mediaobject>
 <imageobject> <imagedata align="center" fileref="dx2-configureX_chooser.png"
 format="PNG" revision="1" xml:id="configureX_chooser-im1"/> </imageobject></mediaobject>
 
@@ -42,7 +45,7 @@ incorrect, or if none are shown.</para>
 
   <itemizedlist>
     <listitem>
-      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Grafikkort</emphasis></para>
+      <para revision="1" xml:id="configureX_chooser-pa2"><emphasis role="bold">Graphics Card</emphasis></para>
 
       <para>If you need to, you can select a specific card from this expandable
 list. See <xref linkend="configureX_card_list"/>.</para>
diff --git a/docs/docs/stable/installer/sv/configureX_monitor.xml b/docs/docs/stable/installer/sv/configureX_monitor.xml
index d6a4c6e5..4c7734a9 100644
--- a/docs/docs/stable/installer/sv/configureX_monitor.xml
+++ b/docs/docs/stable/installer/sv/configureX_monitor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="sv" xml:id="configureX_monitor"
-         xmlns="http://docbook.org/ns/docbook"
+<section version="5.0" xml:lang="sv" xreflabel="Choosing your Monitor"
+         xml:id="configureX_monitor" xmlns="http://docbook.org/ns/docbook"
          xmlns:ns5="http://www.w3.org/1999/xhtml"
          xmlns:ns4="http://www.w3.org/1998/Math/MathML"
          xmlns:ns3="http://www.w3.org/2000/svg"
@@ -18,6 +18,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!-- Initiated by Marga 2012-8-09 -->
 <!-- Further text JohnR  2012-08-30 -->
@@ -25,6 +29,8 @@
 <!---->
 <!--2018/02/12 apb: Text and typography-->
 <!--2018/02/22 apb: Change list style.-->
+<!--2019/01/06 apb: Slight rewording.-->
+<!--2019/08/10 apb: Added xreflabel.-->
 <title xml:id="configureX_monitor-ti1">Att välja din bildskärm</title>
   </info>
 
@@ -72,8 +78,8 @@ type from the monitor database.</para>
       <term revision="1" xml:id="configureX_monitor-pa7">Tillverkare</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa8">Om installationen inte har upptäckt din bildskärm och du vet vilken du har
-så kan du välja den från trädet genom att välja:</para>
+        <para revision="1" xml:id="configureX_monitor-pa8">If the installer has not correctly detected your monitor and you know which
+one you have, you can choose it from the options by selecting:</para>
       </listitem>
     </varlistentry>
   </variablelist>
@@ -93,11 +99,12 @@ så kan du välja den från trädet genom att välja:</para>
       <term revision="1" xml:id="configureX_monitor-pa9">Allmänna</term>
 
       <listitem>
-        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list nearly 30 display configurations such as
-1024x768 @ 60Hz and includes flat-panel displays as used in laptops. This is
-often a good monitor selection group if you need to use the VESA card driver
-when your video hardware cannot be determined automatically.  Once again it
-may be wise to be conservative in your selections.</para>
+        <para revision="1" xml:id="configureX_monitor-pa10">Selecting this group will list approximately 30 display configurations such
+as 1024x768 @ 60Hz and includes flat-panel displays as used in laptops.
+This is often a good monitor selection group if you need to use the VESA
+card driver when your video hardware cannot be determined
+automatically. Once again, it may be wise to be conservative in your
+selections.</para>
       </listitem>
     </varlistentry>
   </variablelist>
diff --git a/docs/docs/stable/installer/sv/diskdrake.xml b/docs/docs/stable/installer/sv/diskdrake.xml
index 6094a94e..4df3fa13 100644
--- a/docs/docs/stable/installer/sv/diskdrake.xml
+++ b/docs/docs/stable/installer/sv/diskdrake.xml
@@ -13,8 +13,10 @@
   
 
   
-    
-    
+
+  
+
+  
 
   <info>
     <!-- Lebarhon 2016 12 16 updated for Mageia 6
@@ -23,7 +25,8 @@ Lebarhon 20170902 added SC-->
 <!--2018/02/12 apb: Text and typography.-->
 <!--2018/02/17 apb: Fix a couple of tags that were out of place + added 'xreflabel="DiskDrake" at start of doc.-->
 <!--2018/02/27 apb: Reformat the text and add titles for the boot partition SC's.-->
-<!--2018/02/27 apb: Slight reword to 1st bullet-point.-->
+<!--2019/01/05 apb: Slight reword to 1st bullet-point.-->
+<!--2019/08/06 apb: Slight reword to 2nd bullet-point (was mentioning sda & sdb tabs in previous SC version).-->
 <title xml:id="diskdrake-ti1">Anpassad diskpartitionering med DiskDrake</title>
   </info>
 
@@ -41,8 +44,8 @@ before you start.</para>
 
     <listitem>
       <para revision="1" xml:id="diskdrake-pa4">There is a tab at the top for every detected hard disk (or other storage
-device, like a USB key). In the screenshot above there are two available
-devices: <filename>sda </filename>and <filename>sdb</filename>.</para>
+device, like a USB key), for example: <filename>sda</filename>,
+<filename>sdb</filename>, <filename>sdc</filename> etc.</para>
     </listitem>
 
     <listitem>
diff --git a/docs/docs/stable/installer/sv/doPartitionDisks.xml b/docs/docs/stable/installer/sv/doPartitionDisks.xml
index 7b931b81..0c85f720 100644
--- a/docs/docs/stable/installer/sv/doPartitionDisks.xml
+++ b/docs/docs/stable/installer/sv/doPartitionDisks.xml
@@ -20,6 +20,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--lebarhon 20161216 updated for Mageia 6
   
@@ -31,6 +35,8 @@ lebarhon 20170209 added SC-->
 <!--2018/02/21 apb: Changed list styles.-->
 <!--2018/02/24 apb: Changed list styles.-->
 <!--2019/01/11 apb: Auto allocation of drive space rules: small edits for style consistency.-->
+<!--2019/07/06 apb: Added live-doPartitionDisksk.png, as it was previously sharing the DrakX screenshot.-->
+<!--2019/08/23 apb: Moved 'Important' note from 'Erase and Use Entire Disk' to 'Use Free Space on a Windows Partition'. Slight text tweak to to first para, 'Warning' and 'Important' -->
 <title xml:id="doPartitionDisks-ti1">Föreslagen partitionering</title>
   </info>
 
@@ -69,14 +75,30 @@ Windows-partition</emphasis></para>
 
       <para revision="1" xml:id="suggestedPartitioning-pa9">If you have unused space on an existing Windows partition, the installer may
 offer to use it. This can be a useful way of making room for your new Mageia
-installation, but is a risky operation so you should make sure you have
-backed up all important files!</para>
+installation but see the warning below.</para>
 
       <para>With this option, the installer displays the remaining Windows partition in
 light blue and the proposed Mageia partition in dark blue with their
 intended sizes just underneath. You have the option to modify these sizes by
 clicking and dragging the gap between both partitions.  See the following
-screenshot:</para>
+screenshot:<mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject></para>
+
+      <warning>
+        <para>This involves shrinking the size of the Windows partition, and therefore is
+a risky operation, so you should make sure you have backed up all important
+files before proceeding.</para>
+      </warning>
+
+      <important>
+        <para revision="3" xml:id="doPartitionDisks-pa11">The partition must be "clean", meaning that Windows must have closed down
+correctly the last time it was used. It must also have been defragmented,
+although this is not a guarantee that all files in the partition have been
+moved out of the area that is about to be used for Mageia.</para>
+      </important>
     </listitem>
 
     <listitem>
@@ -89,15 +111,6 @@ screenshot:</para>
 intend to use part of the disk for something else, or you already have data
 on the drive that you are not prepared to lose, then do not use this option.</para>
       </warning>
-
-      <important>
-        <para revision="3" xml:id="doPartitionDisks-pa11">Observera att det innebär att storleken på Windows-partitionen
-krymps. Partitionen måste vara "ren", dvs. att Windows måste ha stängts av
-korrekt när det användes sist. Den måste också ha defragmenterats, även om
-det inte är någon garanti för att filerna har flyttats bort ifrån ytan som
-kommer att användas. Du rekommenderas starkt att säkerhetskopiera dina
-personliga filer.</para>
-      </important>
     </listitem>
 
     <listitem>
@@ -108,12 +121,6 @@ din/a disk/ar.</para>
     </listitem>
   </itemizedlist>
 
-  <mediaobject>
-<imageobject condition="classical"> <imagedata align="center"
-fileref="dx2-doPartitionDisks2.png"/> </imageobject> <imageobject
-condition="live"> <imagedata align="center"
-fileref="live-doPartitionDisks2.png"/> </imageobject></mediaobject>
-
   <para>If you are not using the <emphasis>Custom disk partitioning</emphasis>
 option, then the installer will allocate the available space according to
 the following rules:</para>
@@ -186,8 +193,10 @@ condition="live"> <imagedata align="center"
 fileref="live-doPartitionDisks3.png"/> </imageobject></mediaobject>
 
   <mediaobject>
-<imageobject> <imagedata align="center"
-fileref="dx2-doPartitionDisks4.png"/> </imageobject></mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="dx2-doPartitionDisks4.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-doPartitionDisks4.png"/> </imageobject></mediaobject>
 
   <important>
     <para>Some newer drives are now using 4096 byte logical sectors, instead of the
diff --git a/docs/docs/stable/installer/sv/firewall.xml b/docs/docs/stable/installer/sv/firewall.xml
index 463f2de5..2f2dc81d 100644
--- a/docs/docs/stable/installer/sv/firewall.xml
+++ b/docs/docs/stable/installer/sv/firewall.xml
@@ -1,4 +1,13 @@
-<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="firewall" version="5.0" xml:lang="sv" xreflabel="Firewall">
+<?xml version="1.0" encoding="utf-8"?>
+<section version="5.0" xml:lang="sv" xreflabel="Firewall" xml:id="firewall"
+         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">
+  
+
   
 
   
@@ -6,14 +15,19 @@
   <info>
     <!--2018/02/15 apb: Text and typography.-->
 <!--2018/02/25 apb: Added xreflabel for this section.-->
+<!--2019/07/23 apb: Added dx2-firewall.png for this section.-->
 <title xml:id="firewall-ti1">Brandvägg</title>
   </info>
 
-  <para xml:id="firewall-pa1" revision="1">This section allows you to configure some simple firewall rules: they
+  <para revision="1" xml:id="firewall-pa1">This section allows you to configure some simple firewall rules: they
 determine which type of message from the Internet will be accepted by the
 target system. This, in turn, allows the corresponding services on the
 system to be accessible from the Internet.</para>
 
+  <mediaobject>
+<imageobject> <imagedata align="center" fileref="dx2-firewall.png"/>
+</imageobject></mediaobject>
+
   <para>In the default setting (no button is checked), no service of the system is
 accessible from the network. The <emphasis>Everything (no
 firewall)</emphasis> option enables access to all services of the machine -
@@ -33,15 +47,15 @@ from the network.</para>
 a series of services by typing a list of <quote>couples</quote> (blank
 separated)</para>
 
-  <para><emphasis>&lt;portnummer>/&lt;protokoll></emphasis></para>
+  <para><emphasis>&lt;port-number&gt;/&lt;protocol&gt;</emphasis></para>
 
   <simplelist>
-    <member>- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to
-the service you want to enable (e.g. 873 for the RSYNC service) as defined
-in <emphasis>RFC-433</emphasis>;</member>
+    <member>- <emphasis>&lt;port-number&gt;</emphasis> is the value of the port assigned
+to the service you want to enable (e.g. 873 for the RSYNC service) as
+defined in <emphasis>RFC-433</emphasis>;</member>
 
-    <member>- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or
-<emphasis>UDP</emphasis> - the internet protocol that is used by the
+    <member>- <emphasis>&lt;protocol&gt;</emphasis> is one of <emphasis>TCP</emphasis>
+or <emphasis>UDP</emphasis> - the internet protocol that is used by the
 service.</member>
   </simplelist>
 
@@ -50,4 +64,4 @@ is <emphasis>873/tcp</emphasis>.</para>
 
   <para>In case a service is implemented to use both protocols, you specify 2
 couples for the same port.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/docs/docs/stable/installer/sv/installer.xml b/docs/docs/stable/installer/sv/installer.xml
index b7989744..69fb06d0 100644
--- a/docs/docs/stable/installer/sv/installer.xml
+++ b/docs/docs/stable/installer/sv/installer.xml
@@ -26,6 +26,8 @@
 
   
 
+  
+
   <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.
@@ -39,6 +41,7 @@
 <!--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: 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.-->
+<!--2019/07/17 apb: Force dx-welcome.png and dx-welcome2.png to be 800px wide.-->
 <title xml:id="installer-ti1">DrakX, Mageias installerare</title>
   </info>
 
diff --git a/docs/docs/stable/installer/sv/setupBootloader.xml b/docs/docs/stable/installer/sv/setupBootloader.xml
index 0f027ae8..fde5dbd4 100644
--- a/docs/docs/stable/installer/sv/setupBootloader.xml
+++ b/docs/docs/stable/installer/sv/setupBootloader.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <section version="5.0" xml:lang="sv" xreflabel="Bootloader" xml:id="setupBootloader"
          xmlns="http://docbook.org/ns/docbook"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
          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"
@@ -22,6 +23,10 @@
 
   
 
+  
+
+  
+
   <info>
     <!--Lebarhon 2015 07 04 Project for Mageia 5. The UEFI and BIOS systems are so different I think it is better to split the page 
 Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
@@ -32,44 +37,71 @@ Lebarhon 2016 12 16 updated for Mageia 6.  20170209 updated SC-->
 <!--2018/02/25 apb: Added xreflabel to this section.-->
 <!--2019/01/06 apb: Typo.-->
 <!--2019/01/06 apb: Use 'xi:include' for setupBootloaderAddEntry.xml, as that is how it is called by the inline-help drakx/perl routine.-->
+<!--2019/07/18 apb: Rewrite 1.1, to accomodate inclusion of rEFInd option, and modify 1.2.1, 1.2.2 accordingly.-->
+<!--2019/08/01 apb: 1.1.1 reworded to: GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system. Added warning text for 1.2.2 Do not Touch MBR/ESP part.-->
 <title xml:id="setupBootloader-ti1">Starthanterare</title>
   </info>
 
   <section>
-    <title>Grub2</title>
+    <title>Available Bootloaders</title>
+
+    <section>
+      <title>Grub2</title>
 
-    <itemizedlist>
-      <title>Grub2 on Legacy MBR/GPT systems</title>
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2 on Legacy MBR/GPT systems</emphasis></para>
 
-      <listitem>
-        <para>GRUB2 (with or without graphical menu) will be used exclusively as the
+        <listitem>
+          <para>GRUB2 (with or without graphical menu) will be used exclusively as the
 bootloader for a Legacy/MBR or Legacy/GPT system.</para>
-      </listitem>
+        </listitem>
 
-      <listitem>
-        <para>By default, a new bootloader will be written into either the MBR (Master
+        <listitem>
+          <para>By default, a new bootloader will be written into either the MBR (Master
 Boot Record) of your first hard drive or in the BIOS boot partition.</para>
-      </listitem>
-    </itemizedlist>
+        </listitem>
+      </itemizedlist>
 
-    <itemizedlist>
-      <title>Grub2-efi för ett UEFI-system.</title>
+      <itemizedlist>
+        <para><emphasis role="bold">Grub2-efi on UEFI systems</emphasis></para>
 
-      <listitem>
-        <para>GRUB2-efi will be used exclusively as the bootloader for a UEFI system.</para>
-      </listitem>
+        <listitem>
+          <para>GRUB2-efi or rEFInd may be used as the bootloader for a UEFI system.</para>
+        </listitem>
 
-      <listitem>
-        <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
+        <listitem>
+          <para>By default, a new bootloader (Grub2-efi) will be written into the ESP (EFI
 System Partition).</para>
 
-        <para>If there are already UEFI-based operating systems installed on your computer
+          <para>If there are already UEFI-based operating systems installed on your computer
 (Windows 8 for example), the Mageia installer will detect the existing ESP
-created by Windows and add grub2-efi to it. If no ESP exists, then one will
+created by Windows and add grub2-efi to it.  If no ESP exists, then one will
 be created. Although it is possible to have several ESPs, only one is
 required, whatever the number of operating systems you have.</para>
-      </listitem>
-    </itemizedlist>
+        </listitem>
+      </itemizedlist>
+    </section>
+
+    <section>
+      <title>rEFInd</title>
+
+      <itemizedlist>
+        <para><emphasis role="bold">rEFInd on UEFI systems</emphasis></para>
+
+        <listitem>
+          <para>rEFInd has a nice graphical set of options, and can auto-detect installed
+EFI bootloaders. See: http://www.rodsbooks.com/refind/</para>
+        </listitem>
+      </itemizedlist>
+
+      <note>
+        <para>Please note that in order to be able to use the <literal>rEFInd</literal>
+option, an installed EFI System Partition must match your system
+architecture: if you have a 32bit EFI System Partition installed on a 64bit
+machine for instance, then the rEFInd option will not be displayed/available
+to you.</para>
+      </note>
+    </section>
   </section>
 
   <section>
@@ -90,14 +122,34 @@ xml:id="setupBootloader-im1"/> </imageobject></mediaobject>
         <listitem>
           <para><emphasis role="bold">Uppstartshanterare att använda</emphasis></para>
 
-          <para>This feature is only available to Legacy MBR/BIOS systems.  Users of UEFI
-systems will not see this option here.</para>
+          <itemizedlist>
+            <listitem>
+              <para><guimenuitem>GRUB2</guimenuitem> (with either a graphical or a text menu),
+can be chosen for both <literal>Legacy MBR/BIOS</literal> systems and
+<literal>UEFI</literal> systems.</para>
+            </listitem>
+
+            <listitem>
+              <para><guimenuitem>rEFInd</guimenuitem> (with a graphical menu)  is an alternative
+option solely for use with <literal>UEFI</literal> systems.</para>
+            </listitem>
+          </itemizedlist>
         </listitem>
 
         <listitem>
           <para><emphasis role="bold">Boot device</emphasis></para>
 
-          <para>Ändra inte på det här om du inte vet vad du gör</para>
+          <warning>
+            <para>Don't change this unless you really know what you are doing.</para>
+          </warning>
+
+          <note>
+            <para>There is no option to write GRUB to the boot sector of a partition (e.g:
+<filename>sda1</filename>), as this method is considered unreliable.</para>
+          </note>
+
+          <para>When using UEFI mode, then the <guilabel>Boot device</guilabel> will be
+listed as <guimenuitem>EFI System Partition</guimenuitem>.</para>
         </listitem>
 
         <listitem>
@@ -171,6 +223,38 @@ specific processor in an SMP system</para>
     <section>
       <title>Konfiguration av starthanterare</title>
 
+      <para>If, in the previous section you selected <literal>rEFInd</literal> as the
+bootloader to use, you would then be presented with the options shown in the
+screenshot directly below. Otherwise, please instead move on to the
+subsequent screenshot for your options.</para>
+
+      <mediaobject>
+<imageobject condition="classical"> <imagedata align="center"
+fileref="rEFIndLoaderConfig.png"/> </imageobject> <imageobject
+condition="live"> <imagedata align="center"
+fileref="live-rEFIndLoaderConfig.png"/> </imageobject></mediaobject>
+
+      <itemizedlist>
+        <para>Your rEFInd configuration options:</para>
+
+        <listitem>
+          <para><guimenuitem>Install or update rEFInd in the EFI system
+partition.</guimenuitem></para>
+        </listitem>
+
+        <listitem>
+          <para><guimenuitem>Install in EFI/Boot partition (workaround for some
+BIOS's).</guimenuitem></para>
+
+          <para>With some BIOS's, the newly written bootloader for Mageia at end of the
+installation will not be recognized. In that case, you can use this option
+as a workaround for the issue.</para>
+        </listitem>
+      </itemizedlist>
+
+      <para>If you did not select rEFInd as the bootloader to use in the previous
+section, then your bootloader configurations are shown below:</para>
+
       <mediaobject>
 <imageobject condition="classical"> <imagedata align="center"
 fileref="dx2-setupBootloader3.png"/> </imageobject> <imageobject
@@ -196,7 +280,7 @@ give you more information as it boots.</para>
 
           <para>If you already have other operating systems installed, Mageia attempts to
 add them to your new Mageia boot menu. If you don't want this behaviour,
-then untick the Probe Foreign OS option.</para>
+then untick the <guimenuitem>Probe Foreign OS</guimenuitem> option.</para>
         </listitem>
       </itemizedlist>
 
@@ -222,8 +306,15 @@ options.</para>
 
           <para>Select this option if you don't want a bootable Mageia, but would rather
 chain-load it from another OS. You will get a warning that the bootloader is
-missing. Click<emphasis> Ok</emphasis> if you are sure you understand the
-implications, and wish to proceed.</para>
+missing. Click <guimenuitem>Ok </guimenuitem>only if you are sure you
+understand the implications, and wish to proceed.</para>
+
+          <warning>
+            <para>Chain-loading via legacy bootloaders (GRUB Legacy and LiLo)  is no longer
+supported by Mageia as it is likely to fail when attempting to boot this
+resulting installation of Mageia. If you use anything other than GRUB2 or
+rEFInd for this purpose, then you do so at your own risk!</para>
+          </warning>
         </listitem>
       </itemizedlist>
 
@@ -255,7 +346,6 @@ doing, as without some form of bootloader your operating system will be
 unable to start.</para>
     </section>
 
-    <xi:include href="setupBootloaderAddEntry.xml"
-                xmlns:xi="http://www.w3.org/2001/XInclude"/>
+    <xi:include href="setupBootloaderAddEntry.xml"/>
   </section>
 </section>