Update translation catalog

25 files changed, 3459 insertions, 2538 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 115b1cc6..f082b332 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-11 16:57+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -559,22 +559,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -585,19 +585,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -607,27 +607,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
-msgstr ""
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -636,13 +637,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -650,28 +651,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -681,7 +682,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -689,38 +690,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -728,7 +733,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2348,29 +2353,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Llavors premeu <guibutton>Següent</guibutton> per a continuar."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2378,10 +2386,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3945,22 +3953,28 @@ msgstr "Addició o modificació d'una entrada al menú d'arrencada"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3971,7 +3985,7 @@ msgstr ""
 "editant la pantalla que hi apareix."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3980,18 +3994,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4000,7 +4015,7 @@ msgstr ""
 "entrada i marcar la casella per a fer-la predeterminada."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4008,7 +4023,7 @@ msgstr ""
 "completament."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4017,19 +4032,19 @@ msgstr ""
 "selecció mentre el sistema està arrencant."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4038,7 +4053,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4046,7 +4061,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4059,14 +4074,22 @@ msgstr "Opcions principals del menú d'arrencada"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4075,7 +4098,7 @@ msgstr ""
 "estat triada automàticament, la podeu canviar aquí."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4086,17 +4109,17 @@ msgstr ""
 "permetre a Mageia que en creï un de nou."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Ús del gestor d'arrencada de Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4105,7 +4128,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4114,7 +4137,7 @@ msgstr ""
 "l'antic GRUB i Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4122,7 +4145,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4131,12 +4154,12 @@ msgstr ""
 "disponible a la pàgina de resum durant la instal·lació."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Ús d'un gestor d'arrencada existent"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4149,7 +4172,7 @@ msgstr ""
 "us permetrà canviar-ne la localització."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4157,13 +4180,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Perquè quedi clar, sda és un dispositiu, mentre que sda7 n'és una partició."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4174,7 +4197,7 @@ msgstr ""
 "pantalla d'instal·lació."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4189,12 +4212,12 @@ msgstr ""
 "del sistema operatiu corresponent."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Opció avançada del gestor d'arrencada"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4207,21 +4230,28 @@ msgstr ""
 "guilabel>. Això ajudarà a mantenir espai lliure."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4233,7 +4263,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4577,10 +4607,11 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index d3ab9be0..f69b2070 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-07-16 09:09+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -589,22 +589,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr "Na kartě pokročilé najdete víc voleb pro nastavení času."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Zavést Mageiu jako živý systém"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Zavedení z datového nosiče"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Z disku"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -620,7 +620,7 @@ msgstr ""
 "která vám nabídne vybrat si zařízení, ze kterého se počítač zavede."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -629,12 +629,12 @@ msgstr ""
 "jedna anebo druhá ze dvou níže uvedených obrazovek."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Ze zařízení USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -649,27 +649,28 @@ msgstr ""
 "která vám nabídne výběr zařízení, z něhož se počítač spustí."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V zastaralém režimu BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "První obrazovka během spouštění v režimu BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "V prostřední nabídce máte volbu mezi třemi činnostmi:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -682,14 +683,14 @@ msgstr ""
 "instalací na pevný disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 "Nainstalovat Mageiu: Tato volba Mageiu přímo nainstaluje na pevný disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -700,30 +701,30 @@ msgstr ""
 "zařízení USB). (nepracuje s Mageiou 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Ve spodní nabídce jsou Volby zavedení systému:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Nápověda. Vysvětluje volby \"splash\", \"apm\", \"acpi\" a \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Jazyk. Vyberte si pro zobrazení jazyka obrazovek."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Rozlišení obrazovky. Volba mezi textem, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -737,7 +738,7 @@ msgstr ""
 "volbě si vyberte jeden z instalačních zdrojů dostupných na serveru."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -747,7 +748,7 @@ msgstr ""
 "s aktualizací ovladače a bude požadovat jeho vložení během procesu instalace."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -756,26 +757,27 @@ msgstr ""
 "počítače a ovladačům, které se použijí."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "V režimu UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "První obrazovka během spuštění z disku na systémech UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -784,7 +786,7 @@ msgstr ""
 "spustit instalaci (druhá volba)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -795,7 +797,7 @@ msgstr ""
 "vybrat."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2510,31 +2512,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Potom stiskněte <guibutton>Další</guibutton> pro pokračování"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Přihlašovací obrazovka"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Přihlašovací obrazovka KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Nakonec se dostanete k přihlašovací obrazovce"
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2545,10 +2548,11 @@ msgstr ""
 "nebo GNOME. Nyní můžete začít používat vaši instalaci Mageii."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Další část naší dokumentace můžete najít na <link linkend=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -4235,22 +4239,26 @@ msgstr "Přidaní nebo změna položky v nabídce zavaděče"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Se systémem BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4261,7 +4269,7 @@ msgstr ""
 "emphasis> a upravováním obrazovky, která se objeví nad ní."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4274,18 +4282,19 @@ msgstr ""
 "použít <code>grub-customizer</code>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4294,13 +4303,13 @@ msgstr ""
 "změna nadpisu položky a zaškrtnutí políčka, aby se položka stala výchozí."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr "Můžete přidat správné číslo verze položky, nebo ji celou přejmenovat."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4309,7 +4318,7 @@ msgstr ""
 "systému neuděláte jinou volbu."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4318,12 +4327,12 @@ msgstr ""
 "prosím, nic bez znalosti toho, co děláte."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Se systémem UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4337,7 +4346,7 @@ msgstr ""
 "položku ve vysouvacím seznamu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4348,7 +4357,7 @@ msgstr ""
 "zavaděčem systémů."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4363,17 +4372,22 @@ msgstr "Základní nastavení zaváděcího programu"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4382,7 +4396,7 @@ msgstr ""
 "vybraných instalátorem, můžete je zde změnit."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4393,17 +4407,17 @@ msgstr ""
 "zavaděči, nebo Mageie dovolíte vytvořit nový zavaděč."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Grafické nabídky Mageii jsou pěkné:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Použití zavaděče Mageii"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4416,7 +4430,7 @@ msgstr ""
 "do vaší nové spouštěcí nabídky Mageii."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4425,7 +4439,7 @@ msgstr ""
 "GRUBu a Lilu."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4436,7 +4450,7 @@ msgstr ""
 "výchozí zavaděč GRUB."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4445,12 +4459,12 @@ msgstr ""
 "souhrnné stránce během instalace."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Použití už existujícího zavaděče"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4463,7 +4477,7 @@ msgstr ""
 "zavaděče."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4474,14 +4488,14 @@ msgstr ""
 "dělení disku, jako je např. sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Pro ujasnění, sda je zařízení, sda7 je oddíl nebo jinak řečeno oddíl na onom "
 "zařízení."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4492,7 +4506,7 @@ msgstr ""
 "+Alt+F7 vás dostane nazpět na obrazovku instalátoru."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4507,12 +4521,12 @@ msgstr ""
 "systému, o nějž jde."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Pokročilé parametry zavaděče"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4526,7 +4540,7 @@ msgstr ""
 "volného místa."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4535,16 +4549,20 @@ msgstr ""
 "zvolit zavaděč systému, jelikož je dostupný jen Grub2-efi."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4563,7 +4581,7 @@ msgstr ""
 "systémů, které máte v počítači."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr "Neupravujte \"Zaváděcí zařízení\", pokud s jistotou nevíte, co děláte."
 
@@ -4957,9 +4975,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4972,3 +4991,28 @@ msgid ""
 msgstr ""
 "Dalším krokem je kopírování souborů na pevný disk. Toto zabere několik "
 "minut. Na konci dostanete na určitý čas prázdnou obrazovku. To je normální."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index ed61628a..0cbb8df1 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-23 18:07+0000\n"
 "Last-Translator: Falco Preiseni <apfelkomplott2014@mailbox.org>\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -608,22 +608,22 @@ msgstr ""
 "bezüglich der Zeiteinstellungen."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Mageia als Live-System starten"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Vom Medium starten"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Von einem optischen Laufwerk"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -641,7 +641,7 @@ msgstr ""
 "wählen können, von welchem Laufwerk Ihr Computer starten soll."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -650,12 +650,12 @@ msgstr ""
 "erhalten Sie einen der beiden unten angezeigten Screenshots."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Von einem USB Gerät"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -672,27 +672,28 @@ msgstr ""
 "können von welchem Laufwerk Sie ihren Computer starten möchten."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Im BIOS/CSM/Legacy Modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Der erste Bildschirm beim starten im BIOS Modus"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "Im mittleren Menü haben Sie die Auswahl zwischen drei Möglichkeiten:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -705,7 +706,7 @@ msgstr ""
 "ist können Sie mit der Installation auf der Festplatte fortfahren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -713,7 +714,7 @@ msgstr ""
 "installieren."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -724,32 +725,32 @@ msgstr ""
 "angeschlossen. (Funktioniert nicht mit Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Im unteren Menü sind die Startoptionen:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Hilfe. Beschreibt die Optionen \"splash\", \"apm\", \"acpi\" und \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 "F2 - Sprache. Hier können Sie die angezeigte Sprache für den Bildschirm "
 "auswählen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Bildschirmauflösung. Wähle zwischen Text, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -765,7 +766,7 @@ msgstr ""
 "dieser Option aus."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -777,7 +778,7 @@ msgstr ""
 "verlangt."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -786,27 +787,28 @@ msgstr ""
 "Hardware und die dafür zu verwendeten Treiber, festlegen."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "Im UEFI Modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 "Der erste Bildschirm beim starten auf einem UEFI System von einem Datenträger"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -815,7 +817,7 @@ msgstr ""
 "Auswahl) oder die Installation zu beginnen (zweite Auswahl)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -826,7 +828,7 @@ msgstr ""
 "Suffix \"USB\". Sie müssen diese Auswählen."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2612,31 +2614,32 @@ msgstr ""
 "Installation fortzufahren."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Anmeldebildschirm"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM Anmeldebildschirm"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Schließlich kommen Sie zum Anmeldebildschirm."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2648,10 +2651,11 @@ msgstr ""
 "Mageia Installation verwenden."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Sie können weitere Teile unserer Dokumentation im <link linkend=\"https://"
 "wiki.mageia.org/de/Kategorie:Dokumentation\">Mageia Wiki</link> finden."
@@ -4382,22 +4386,26 @@ msgstr "Hinzufügen oder ändern eines Boot Menü Eintrags"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Mit einem BIOS System"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4409,7 +4417,7 @@ msgstr ""
 "Fenster, welches darüber erscheint, verändern."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4422,18 +4430,19 @@ msgstr ""
 "editieren oder <code>grub-customizer</code> verwenden."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4442,7 +4451,7 @@ msgstr ""
 "aktivieren das Kästchen, welches den Eintrag als Standard setzt."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4450,7 +4459,7 @@ msgstr ""
 "vollständig umbenennen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4459,7 +4468,7 @@ msgstr ""
 "Standardeintrag vom System gestartet."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4469,12 +4478,12 @@ msgstr ""
 "aus, ohne die Konsequenzen Ihrer Handlung zu kennen."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Mit einem UEFI System"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4488,7 +4497,7 @@ msgstr ""
 "Möglichkeit, den Standard-Eintrag in einer Drop-Down-Liste auszuwählen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4499,7 +4508,7 @@ msgstr ""
 "Bootloader, festgelegt werden."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4514,17 +4523,22 @@ msgstr "Hauptoptionen des Bootloaders"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4534,7 +4548,7 @@ msgstr ""
 "ändern."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4546,17 +4560,17 @@ msgstr ""
 "werden soll, einen neuen Bootloader zu erstellen."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Die grafischen Menüs von Mageia sind schön:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Verwenden des Mageia Bootloaders"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4569,7 +4583,7 @@ msgstr ""
 "Startmenü einzufügen."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4577,7 +4591,7 @@ msgstr ""
 "Mageia bietet jetzt neben GRUB legacy optional auch GRUB2 als Bootloader an."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4588,7 +4602,7 @@ msgstr ""
 "Bootloader erkannt."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4597,12 +4611,12 @@ msgstr ""
 "Zusammenfassungs-Seite empfohlen wird."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Verwenden eines bestehenden Bootloaders"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4616,7 +4630,7 @@ msgstr ""
 "Installationsort des Bootloaders zu ändern."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4627,14 +4641,14 @@ msgstr ""
 "während der Partitionierungsphase gewählt haben, z.B. sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Um es noch einmal klar darzustellen, \"sda\" ist ein Gerät, \"sda7\" ist "
 "eine Partition."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4647,7 +4661,7 @@ msgstr ""
 "Installationsbildschirm zurück."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4663,12 +4677,12 @@ msgstr ""
 "offen sind."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Erweiterte Optionen für den Bootloader"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4682,7 +4696,7 @@ msgstr ""
 "Dies hilft Ihnen, mehr Platz frei zu halten."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4691,16 +4705,20 @@ msgstr ""
 "Bootloader nicht auswählen können weil nur Grub2-efi verfügbar ist."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4720,7 +4738,7 @@ msgstr ""
 "Anzahl der installierten Betriebssysteme."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Änderen Sie nicht das Boot-Medium, außer Sie wissen genau, was Sie tun."
@@ -5124,9 +5142,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -5140,3 +5159,28 @@ msgstr ""
 "Der nächste Schritt ist das kopieren der Dateien auf die Festplatte. Dies "
 "dauert einige Minuten. Am Ende erhalten Sie für eine gewisse Zeit einen "
 "leeren Bildschirm, was normal ist."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/el.po b/docs/installer/el.po
index 1233615f..01c5ec68 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-17 08:40+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -598,22 +598,22 @@ msgstr ""
 "τις ρυθμίσεις του ρολογιού."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Εκκίνηση της Mageia ως σύστημα Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Εκκίνηση του μέσου"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Από τον δίσκο"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -631,7 +631,7 @@ msgstr ""
 "υπολογιστής στην εκκίνηση."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -640,12 +640,12 @@ msgstr ""
 "των δυο παρακάτω οθονών."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Από μια συσκευή USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -661,27 +661,28 @@ msgstr ""
 "εκκινηθεί ο υπολογιστής."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Στο BIOS/CSM/Λειτουργία παλαιού τύπου"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Η πρώτη οθόνη εκκινώντας σε λειτουργία BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "Στο μεσαίο μενού, μπορείτε να επιλέξετε μεταξύ τριών ενεργειών:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -694,14 +695,14 @@ msgstr ""
 "προχωρήσετε στην εγκατάσταση στον σκληρό δίσκο."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 "Εγκατάσταση της Mageia: Απευθείας εγκατάσταση της Mageia στον σκληρό δίσκο."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -712,30 +713,30 @@ msgstr ""
 "DVD ή ένα κλειδί USB) (δεν δουλεύει στην Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Στο μενού στην βάση υπάρχουν οι επιλογές εκκίνησης:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Βοήθεια. Επεξηγεί τις επιλογές \"splash\", \"apm\", \"acpi\" και \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Γλώσσα. Επιλέξτε την γλώσσα εμφάνισης της οθόνης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Ανάλυση της οθόνης. Επιλέξτε μεταξύ κειμένου, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -750,7 +751,7 @@ msgstr ""
 "διαθέσιμες πηγές στον διακομιστή."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -761,7 +762,7 @@ msgstr ""
 "του κατά την διαδικασία της εγκατάστασης."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -770,26 +771,27 @@ msgstr ""
 "ανάλογα με το υλικό σας και τους οδηγούς προς χρήση."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "Σε λειτουργία UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Η πρώτη οθόνη εκκινώντας από τον δίσκο σε σύστημα UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -798,7 +800,7 @@ msgstr ""
 "(πρώτη επιλογή) ή την διαδικασία της εγκατάστασης (δεύτερη επιλογή)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -809,7 +811,7 @@ msgstr ""
 "πρέπει να τις επιλέξετε."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2577,31 +2579,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Έπειτα κάντε κλικ στο <guibutton>Επόμενο</guibutton> για να συνεχίσετε"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Οθόνη εισόδου"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Οθόνη εισόδου KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Εν τέλει, θα βρεθείτε στην οθόνη εισόδου."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2612,10 +2615,11 @@ msgstr ""
 "μέσο που χρησιμοποιήσατε. Μπορείτε εφεξής να χρησιμοποιήσετε την Mageia."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Μπορείτε να βρείτε ένα άλλο τμήμα της τεκμηρίωσης στο <link ns4:href="
 "\"https://wiki.mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -4338,22 +4342,26 @@ msgstr "Προσθήκη ή επεξεργασία μιας καταχώρηση
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Με ένα σύστημα Bios"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4365,7 +4373,7 @@ msgstr ""
 "αναδυόμενο διάλογο."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4379,18 +4387,19 @@ msgstr ""
 "<code>grub-customizer</code>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4400,7 +4409,7 @@ msgstr ""
 "προκαθορισμένη."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4408,7 +4417,7 @@ msgstr ""
 "μετονομάσετε πλήρως."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4417,7 +4426,7 @@ msgstr ""
 "δεν επιλέξετε κάποια άλλη καταχώρηση στην εκκίνηση."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4427,12 +4436,12 @@ msgstr ""
 "γνωρίζετε τι ακριβώς κάνετε."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Με ένα σύστημα UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4447,7 +4456,7 @@ msgstr ""
 "επιλέξετε την εξ ορισμού καταχώρηση από την αναπτυσσόμενη λίστα."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4458,7 +4467,7 @@ msgstr ""
 "Grub2 οι οποίος είναι ένα πρόγραμμα εκκίνησης γραφικού περιβάλλοντος.  "
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4473,17 +4482,22 @@ msgstr "Κύριες επιλογές του προγράμματος εκκίν
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4492,7 +4506,7 @@ msgstr ""
 "εκκίνησης, μπορείτε να τις αλλάξετε από εδώ."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4504,17 +4518,17 @@ msgstr ""
 "ένα νέο."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Τα γραφικά μενού της Mageia είναι πολύ όμορφα:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4527,7 +4541,7 @@ msgstr ""
 "συμπεριλάβει στο νέο μενού εκκίνησης της Mageia."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4536,7 +4550,7 @@ msgstr ""
 "επιπρόσθετα του GRUB legacy και του Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4547,7 +4561,7 @@ msgstr ""
 "προκαθορισμένο GRUB."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4556,12 +4570,12 @@ msgstr ""
 "σελίδα σύνοψης στα βήματα της εγκατάστασης."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4575,7 +4589,7 @@ msgstr ""
 "του προγράμματος εκκίνησης."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4586,12 +4600,12 @@ msgstr ""
 "τον διαμερισμό νωρίτερα π.χ. sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Δηλαδή, το sda είναι μια συσκευή, και το sda7 είναι μια κατάτμηση."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4602,7 +4616,7 @@ msgstr ""
 "Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4618,12 +4632,12 @@ msgstr ""
 "εν λόγω λειτουργικού συστήματος."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Προχωρημένη λειτουργία του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4637,7 +4651,7 @@ msgstr ""
 "ελεύθερου χώρου."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4647,16 +4661,20 @@ msgstr ""
 "είναι διαθέσιμο."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4676,7 +4694,7 @@ msgstr ""
 "του αριθμού των λειτουργικών συστημάτων που διαθέτετε."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Μην τροποποιήσετε το περιφερειακό εκκίνησης εκτός και αν γνωρίζεται τι "
@@ -5082,9 +5100,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -5100,6 +5119,31 @@ msgstr ""
 "λίγο, είναι κανονικό."
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index bdbd30ab..47f101d0 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
@@ -563,22 +563,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -589,19 +589,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -611,30 +611,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -643,13 +643,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -657,28 +657,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -688,7 +688,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -696,42 +696,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" width="
 "\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"acceptLicense-"
 "im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -739,7 +739,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2332,33 +2332,33 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Klaku sur <guibutton>Sekvanta</guibutton> por daŭrigi"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
 "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
 "\"PNG\" /> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2366,10 +2366,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3896,21 +3896,24 @@ msgstr ""
 #: en/setupBootloaderAddEntry.xml:10
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3918,7 +3921,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3927,51 +3930,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
 "setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
 "\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3980,7 +3983,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3988,7 +3991,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
@@ -4006,16 +4009,18 @@ msgstr "Lanĉilaj ĉefaj elektoj"
 #: en/setupBootloader.xml:11
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupBootloader.png\" "
-"align=\"center\" width=\"800\" format=\"PNG\" depth=\"600\" xml:id="
-"\"setupBootloader-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\" /> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4024,7 +4029,7 @@ msgstr ""
 "la instalilo, vi povas ŝanĝi ĝin ĉi tie."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4035,18 +4040,18 @@ msgstr ""
 "Magejo krei novan."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 #, fuzzy
 msgid "The Mageia graphical menus are nice :"
 msgstr "La grafika menuo de Magejo estas bela :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Uzi la lanĉilon de Magejo"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 #, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
@@ -4059,7 +4064,7 @@ msgstr ""
 "ilin al via nova Mageja lanĉilo."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4068,7 +4073,7 @@ msgstr ""
 "legacy and Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
@@ -4080,7 +4085,7 @@ msgstr ""
 "used."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4089,12 +4094,12 @@ msgstr ""
 "the Summary page during installation."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Uzi ekzistantan lanĉilon"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4106,7 +4111,7 @@ msgstr ""
 "lokon de la lanĉilo."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 #, fuzzy
 msgid ""
 "Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
@@ -4118,12 +4123,12 @@ msgstr ""
 "ekzemple sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Klarigcele, sda estas aparato, sda7 subdisko."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4134,7 +4139,7 @@ msgstr ""
 "vin ree al la instal-ekrano."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4148,12 +4153,12 @@ msgstr ""
 "ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Lanĉila sperta elekto"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4167,24 +4172,26 @@ msgstr ""
 "libera spaco."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4196,7 +4203,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4532,8 +4539,8 @@ msgstr ""
 #: en/unused.xml:25
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
 "\"></imagedata> </imageobject>"
@@ -4545,6 +4552,34 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" format=\"PNG\" align=\"center\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupBootloader.png"
+#~ "\" align=\"center\" width=\"800\" format=\"PNG\" depth=\"600\" xml:id="
+#~ "\"setupBootloader-im1\"></imagedata> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
+#~ "\"center\"></imagedata> </imageobject>"
+
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
diff --git a/docs/installer/es.po b/docs/installer/es.po
index c7550950..9be7fc8f 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-05-07 21:54+0000\n"
 "Last-Translator: seacat <seacat.linux@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -597,22 +597,22 @@ msgstr ""
 "En la ficha Avanzada, encontrara más opciones de configuración del reloj."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Iniciar Mageia en modo Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Arrancando el medio"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Desde un disco"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -628,7 +628,7 @@ msgstr ""
 "le ofrecerá un menú arranque donde escoger. "
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -637,12 +637,12 @@ msgstr ""
 "las dos pantallas siguientes."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Desde un dispositivo USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -658,27 +658,28 @@ msgstr ""
 "arrancará la computadora."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "En modo BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Primera pantalla al arrancar en modo BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "En el menú del medio, tiene que elegir entre tres acciones:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -691,7 +692,7 @@ msgstr ""
 "seguir con la instalación en el disco rígido."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -699,7 +700,7 @@ msgstr ""
 "rígido."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -710,30 +711,30 @@ msgstr ""
 "conectado (no funciona con Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "En el menú inferior, las Opciones de Inicio son:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Ayuda. Explicar las opciones \"splash\", \"apm\", \"acpi\" e \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Idioma. Elegir el idioma de visualización de las pantallas."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Resolución de pantalla. Elegir entre texto, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -748,7 +749,7 @@ msgstr ""
 "disponibles en el servidor."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -759,7 +760,7 @@ msgstr ""
 "durante el proceso de instalación."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -768,26 +769,27 @@ msgstr ""
 "acuerdo a su hardware y los controladores a usar."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "En modo UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Primera pantalla durante el arranque del sistema UEFI desde el disco"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -796,7 +798,7 @@ msgstr ""
 "opción) o procesar la instalación (segunda opción)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -804,7 +806,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2524,31 +2526,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Luego, pulse <guibutton>Siguiente</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Pantalla de inicio de sesión"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Pantalla de inicio de sesión de KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Por último, se llega a la pantalla de inicio de sesión."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2559,10 +2562,11 @@ msgstr ""
 "Ahora puede comenzar a utilizar la instalación de Mageia."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Puede encontrar otra parte de nuestra documentación en <link linkend="
 "\"https://wiki.mageia.org/en/Category:Documentation\">la wiki de Mageia</"
@@ -4190,22 +4194,26 @@ msgstr "Agregando o modificando una entrada en el menú de arranque"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Con un sistema BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4216,7 +4224,7 @@ msgstr ""
 "y modificando los opciones en la ventana que aparece encima."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4229,18 +4237,19 @@ msgstr ""
 "lugar."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4249,7 +4258,7 @@ msgstr ""
 "entrada y marcar una como la predeterminada."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4257,7 +4266,7 @@ msgstr ""
 "renombrar completamente."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4266,7 +4275,7 @@ msgstr ""
 "que seleccione otra."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4275,12 +4284,12 @@ msgstr ""
 "no intente algo sin saber lo que está haciendo."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Con un sistema UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4289,7 +4298,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4297,7 +4306,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4312,17 +4321,22 @@ msgstr "Opciones principales del cargador de arranque"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4331,7 +4345,7 @@ msgstr ""
 "elinstalador del cargador de arranque, aquí puede cambiarla."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4342,17 +4356,17 @@ msgstr ""
 "permitir a Mageia crear uno nuevo."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Los menús gráficos de Mageia son agradables:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Usando el cargador de arranque de Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4361,7 +4375,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4370,7 +4384,7 @@ msgstr ""
 "opcionalademás del tradicional GRUB y de Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4378,7 +4392,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4387,12 +4401,12 @@ msgstr ""
 "en la página de resumen durante la instación."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Usando un cargador de arranque existente"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4405,7 +4419,7 @@ msgstr ""
 "permitirá cambiar el lugar de instalación del cargador de arranque."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4413,12 +4427,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Para ser claro, sda es un dispositivo, sda7 es una partición."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4429,7 +4443,7 @@ msgstr ""
 "al instalador."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4444,12 +4458,12 @@ msgstr ""
 "sistema operativo en cuestión."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Opción avanzada del cargador de arranque"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4463,7 +4477,7 @@ msgstr ""
 "libre."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4473,16 +4487,20 @@ msgstr ""
 "está disponible."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4494,7 +4512,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "No modifique el \"Dispositivo de Arranque\" a menos que sepa realmente qué "
@@ -4884,9 +4902,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4900,3 +4919,28 @@ msgstr ""
 "El siguiente paso es copiar los archivos al disco rígido. Esto toma algunos "
 "minutos. Al final se obtiene una pantalla en blanco durante algún tiempo. Es "
 "normal."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/et.po b/docs/installer/et.po
index a53e16a2..aef4f475 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-05-27 04:33+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -92,8 +92,7 @@ msgid ""
 "guibutton> button."
 msgstr ""
 "Kui tunnete huvi, mida on <application>Mageia</application> käesolevas "
-"väljalaskes uut, klõpsake nupule <guibutton>Väljalaskemärkmed</"
-"guibutton>."
+"väljalaskes uut, klõpsake nupule <guibutton>Väljalaskemärkmed</guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
@@ -106,9 +105,9 @@ msgstr "et"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 
-#.  papoteur 2013-04-13  - created
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell
+#.  papoteur 2013-04-13  - created 
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
 #: en/add_supplemental_media.xml:18
 msgid ""
@@ -180,18 +179,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Kasutajate ja administraatori haldamine"
 
-#.  Started by marja,using Led43's text, on 2012 03 27
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
+#.  Started by marja,using Led43's text, on 2012 03 27 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
 #.  removed para xml:id's, finished the page using Led43's text in the wiki, but
-#.        changed his text about the Advanced User Managment screen (the only thing
-#.        about guest account there, is the box you can tick or untick to enable or
+#.        changed his text about the Advanced User Managment screen (the only thing 
+#.        about guest account there, is the box you can tick or untick to enable or 
 #.        disable it, the rest is about the normal user you're adding in the previous
 #.        screen), marja, 20120409
 #.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
+#.        "rbash" in the xguest warning - is that correct? 
+#.  JohnR 2012-04-19 Language proofreading  
+#.  marja 2012-04-24 Added screenshot 
 #.  marja 2013-04-26 added new note
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:28
@@ -435,17 +434,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Haakepunktide valimine"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
 #.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
 #.  Marja: you're right, in English English it is "its type", however, the Americans
 #.        write "it's type". And you're right about the redundant part, too, I removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
@@ -568,33 +567,32 @@ msgid ""
 "In this step, you have to select on which time your internal clock is set, "
 "either local time or UTC time."
 msgstr ""
-"Siin tuleb valida, kas arvuti sisemine kell on seatud kohalikule ajale "
-"või UTC ehk standardajale."
+"Siin tuleb valida, kas arvuti sisemine kell on seatud kohalikule ajale või "
+"UTC ehk standardajale."
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:23
 msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
-"Muude valikute kaadril leiab rohkem võimalusi kellaaega "
-"täpsemalt seadistada."
+"Muude valikute kaadril leiab rohkem võimalusi kellaaega täpsemalt seadistada."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Mageia laadimine Live-süsteemina"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Käivitamine andmekandjalt"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Kettalt"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -604,28 +602,28 @@ msgid ""
 "computer will boot."
 msgstr ""
 "Algkäivituse võib teha otse andmekandjalt, millele olete kirjutanud oma "
-"tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja "
-"lihtsalt asetada CD/DVD-seadmesse ning alglaadur käivitab arvuti "
-"taaskäivitamise järel paigaldamise automaatselt. Kui seda ei juhtu, "
-"võib olla vajalik BIOS ümber seadistada või vajutada vastavat "
-"klahvi, mis võimaldab valida lisaseadme, millest arvuti käivitada."
+"tõmmise (CD-ROM, DVD-ROM vms). Tavaliselt tuleb andmekandja lihtsalt asetada "
+"CD/DVD-seadmesse ning alglaadur käivitab arvuti taaskäivitamise järel "
+"paigaldamise automaatselt. Kui seda ei juhtu, võib olla vajalik BIOS ümber "
+"seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme, "
+"millest arvuti käivitada."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
-"Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht "
-"kahest alltoodud ekraanist."
+"Sõltuvalt teie riistvarast ja selle kehtivast seadistusest näete üht kahest "
+"alltoodud ekraanist."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "USB-pulgalt"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -634,33 +632,34 @@ msgid ""
 "peripheral from which the computer will boot."
 msgstr ""
 "Algkäivituse saab teha USB-pulgalt, millele kirjutasite ISO-tõmmise. "
-"Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda USB-pulgalt, "
-"mis on masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik "
-"BIOS ümber seadistada või vajutada vastavat klahvi, mis võimaldab "
-"valida lisaseadme, millest arvuti käivitada. "
+"Sõltuvalt BIOS-e seadistusest võib arvuti otse käivituda USB-pulgalt, mis on "
+"masinaga ühendatud. Kui seda ei juhtu, võib olla vajalik BIOS ümber "
+"seadistada või vajutada vastavat klahvi, mis võimaldab valida lisaseadme, "
+"millest arvuti käivitada. "
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS-e/CSM-i/Pärandrežiimis"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Esimene ekraan BIOS-e režiimis algkäivitusel"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "Keskel asuvas menüüs saab valida kolme võimaluse vahel:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -668,52 +667,50 @@ msgid ""
 "disk."
 msgstr ""
 "Mageia laadimine: see tähendab, et Mageia 5 käivitatakse ühendatud "
-"andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, "
-"mis ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine "
-"on läbi, võite ka süsteemi kõvakettale paigaldada."
+"andmekandjalt (CD/DVD või USB-pulk) ilma midagi kettale kirjutamata, mis "
+"ühtlasi tähendab, et kõik võib olla väga aeglane. Kui käivitamine on läbi, "
+"võite ka süsteemi kõvakettale paigaldada."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
-msgstr ""
-"Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe "
-"kõvakettale."
+msgstr "Mageia paigaldamine: sel juhul paigaldatakse Mageia kohe kõvakettale."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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)."
 msgstr ""
-"Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, "
-"nagu seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) "
-"pole masinaga ühendatud (Mageia 5 puhul see ei toimi)."
+"Alglaadimine kõvakettalt: sel juhul käivitatakse süsteem kõvakettal, nagu "
+"seda tehakse ka siis, kui andmekandjat (CD/DVD või USB-pulk) pole masinaga "
+"ühendatud (Mageia 5 puhul see ei toimi)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Allservas asuvas menüüs leiab alglaadimisvalikud:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 - Abi. Selgitab valikuid \"splash\", \"apm\", \"acpi\" ja \"Ide\"."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - keel. Ekraanil nähtava keele valimine."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr "F3 - ekraanilahutus. Valida on tekst, 640x400, 800x600, 1024x728."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -721,52 +718,52 @@ msgid ""
 "server, select one of the installation sources available on the server with "
 "this option."
 msgstr ""
-"F4 - CD-Rom. CD-Rom või Muu. Tavaliselt sooritatakse paigaldamine "
-"ühendatud paigaldusandmekandjalt. Siin saab valida ka muu allika, "
-"näiteks FTP- või NFS-serveri. Kui paigaldus sooritatakse SLP-serveriga "
-"võrgus, tuleb selle korral valida serveril saada olev paigaldusandmekandja."
+"F4 - CD-Rom. CD-Rom või Muu. Tavaliselt sooritatakse paigaldamine ühendatud "
+"paigaldusandmekandjalt. Siin saab valida ka muu allika, näiteks FTP- või NFS-"
+"serveri. Kui paigaldus sooritatakse SLP-serveriga võrgus, tuleb selle korral "
+"valida serveril saada olev paigaldusandmekandja."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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."
 msgstr ""
-"F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega "
-"lisaketta olemasolust ning nõuab selle paigaldamise käigus "
-"selle ühendamist."
+"F6 - draiver. Jah või Ei. Süsteem on teadlik draiveriuuendusega lisaketta "
+"olemasolust ning nõuab selle paigaldamise käigus selle ühendamist."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
-"F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, "
-"mida vajavad teie riistvara ja kasutatavad draiverid."
+"F6 - kerneli võtmed. Siin saab määrata konkreetseid võtmeid, mida vajavad "
+"teie riistvara ja kasutatavad draiverid."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "UEFI režiimis"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Esimene ekraan UEFI süsteemi käivitamisel kettalt"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -775,27 +772,26 @@ msgstr ""
 "valik) või paigaldamine (teine valik)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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."
 msgstr ""
-"Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on "
-"muidu samasugused nagu kaks esimest, ainult et lisatud on \"USB\". "
-"Siis tuleb valida üks neist."
+"Kui olete süsteemi laadinud USB-pulgalt, näeb veel kaht rida, mis on muidu "
+"samasugused nagu kaks esimest, ainult et lisatud on \"USB\". Siis tuleb "
+"valida üks neist."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "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>."
 msgstr ""
-"Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi "
-"ja klaviatuuri valimine, seejärel aga lähevad asjad lahku <link "
-"linkend=\"testing\">"
-"Live-režiimi lisasammude</link> tõttu."
+"Kõigil juhtudel on esimesteks sammudeks ühtmoodi keele, ajavööndi ja "
+"klaviatuuri valimine, seejärel aga lähevad asjad lahku <link linkend="
+"\"testing\">Live-režiimi lisasammude</link> tõttu."
 
 #. type: Content of: <section><info><title>
 #: en/chooseDesktop.xml:5
@@ -951,8 +947,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Teenuste seadistamine"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureServices.xml:21
 msgid ""
@@ -1006,8 +1002,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Ajavööndi seadistamine"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
 msgid ""
@@ -1664,8 +1660,7 @@ msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
-"Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite "
-"kohaselt:"
+"Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:109
@@ -1673,8 +1668,8 @@ msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
-"Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon "
-"/ jaoks ning /home jaoks eraldi partitsiooni ei looda."
+"Kui kokku on saadaval alla 50 GB, luuakse ainult üks partitsioon / jaoks "
+"ning /home jaoks eraldi partitsiooni ei looda."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
@@ -1687,8 +1682,7 @@ msgstr "Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni"
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
-"6/19 saadaolevast koguruumist eraldatakse / jaoks maksimaalse suurusega "
-"50 GB"
+"6/19 saadaolevast koguruumist eraldatakse / jaoks maksimaalse suurusega 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:125
@@ -1706,8 +1700,8 @@ msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
-"See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm "
-"kolm partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
+"See tähendab, et kui ruumi on 160 GB või rohkem, loob paigaldusprogramm kolm "
+"partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
 
 #. type: Content of: <section><note><para>
 #: en/doPartitionDisks.xml:140
@@ -1717,10 +1711,10 @@ msgid ""
 "boot/EFI. The \"Custom\" option is the only one that allows to check it has "
 "been correctly done"
 msgstr ""
-"Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP "
-"(EFI süsteemne partitsioon) või see luuakse, kui seda pole, ja "
-"haagitakse asukohas /boot/EFI. Valik \"Kohandatud\" on ainuke, "
-"mis lubab kontrollida, kas seda on õigesti tehtud."
+"Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne "
+"partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas /boot/"
+"EFI. Valik \"Kohandatud\" on ainuke, mis lubab kontrollida, kas seda on "
+"õigesti tehtud."
 
 #. type: Content of: <section><warning><para>
 #: en/doPartitionDisks.xml:147
@@ -1870,9 +1864,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Õnnitleme!"
 
-#.  Started by marja on 2012 03 29
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#.  marja - 2012-04-24 added screenshot and text
+#.  Started by marja on 2012 03 29 
+#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
+#.  marja - 2012-04-24 added screenshot and text 
 #.  same day, added "s" to "sytems"
 #. type: Content of: <section><mediaobject>
 #: en/exitInstall.xml:14
@@ -1932,10 +1926,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Vormindamine"
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:18
 msgid ""
@@ -2463,10 +2457,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Uuendused"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 03 30 
+#.  NEEDS TO BE REVIEWED! 
 #.  marja 20120418 removed 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"" from section tag, trying to restore correct html filename
-#.  marja, 2012-04-24 added screenshot
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2503,57 +2497,59 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Sisselogimisekraan"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM-i sisselogimisekraan"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Lõpuks ilmub sisselogimisekraan."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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."
 msgstr ""
-"Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie "
-"ette juba KDE või GNOME töölaud vastavalt sellele, millist live-andmekandjat "
-"te kasutate. Nüüd võite oma vastset Mageiat kasutama hakata."
+"Kirjutage oma kasutajanimi ja parool ning mõne hetke pärast ilmub teie ette "
+"juba KDE või GNOME töölaud vastavalt sellele, millist live-andmekandjat te "
+"kasutate. Nüüd võite oma vastset Mageiat kasutama hakata."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
-"Rohkem teavet leiab <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">Mageia wikist</link>."
+"Rohkem teavet leiab <link linkend=\"https://wiki.mageia.org/en/Category:"
+"Documentation\">Mageia wikist</link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr "Andmekandjate valik (mittevaba tarkvara)"
 
-#.  papoteur 2013-04-11  - created
+#.  papoteur 2013-04-11  - created 
 #.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
 #. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
@@ -2703,18 +2699,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Seadistuste kokkuvõte"
 
-#.  Started by marja on 2012 03 31
-#.  NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
+#.  Started by marja on 2012 03 31 
+#.  NEEDS TO BE WRITTEN AND REVIEWED! 
+#. marja - 2012 04 15 added some text, not much, unfortunately :( 
+#. marja 2012-04-24 added screenshots 
 #. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#.       the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader"
+#. marja 2012-04-24 added 2 links to other help pages 
+#. marja 2012-04-24 added some text in the drakxid-configureServices and 
+#.       the drakxid-miscellaneous section 
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
+#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
+#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
 #. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
 #. type: Content of: <section><mediaobject>
 #: en/misc-params.xml:33
@@ -3041,9 +3037,9 @@ msgid ""
 "software media are being downloaded (see Software management)."
 msgstr ""
 "Kui alglaadur on paigaldatud, palutakse teil arvuti seisata, Live-CD "
-"eemaldada ja arvuti taaskäivitada. Taaskäivitamise järel näete "
-"allalaadimise edenemisribasid. Need annavad märku, et parajasti "
-"laaditakse alla tarkvaraallikaid (vt täpsemalt tarkvarahalduse osast)."
+"eemaldada ja arvuti taaskäivitada. Taaskäivitamise järel näete allalaadimise "
+"edenemisribasid. Need annavad märku, et parajasti laaditakse alla "
+"tarkvaraallikaid (vt täpsemalt tarkvarahalduse osast)."
 
 #. type: Content of: <section><info><title>
 #: en/resizeFATChoose.xml:16
@@ -3070,8 +3066,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Turbetase"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:19
 msgid ""
@@ -3121,8 +3117,8 @@ msgid ""
 "Mageia is distributed via ISO images. This page will help you to choose "
 "which image match your needs."
 msgstr ""
-"Mageiat levitatakse ISO-tõmmiste kaudu. Siin leiab abi valimaks "
-"just sellist tõmmist, mis vastab teie vajadustele."
+"Mageiat levitatakse ISO-tõmmiste kaudu. Siin leiab abi valimaks just sellist "
+"tõmmist, mis vastab teie vajadustele."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:14
@@ -3137,11 +3133,11 @@ msgid ""
 "This give you the maximal flexibility for a customized installation, in "
 "particular to choose which Desktop Environment you will install."
 msgstr ""
-"Klassikaline paigaldusandmekandja. Selle käivitamise järel "
-"asutakse kohe paigaldamise juurde ning te saate valida, mida "
-"paigaldada ja kuidas süsteemi vastavalt seadistada. See annab "
-"maksimaalse paindlikkuse ja lubab luua kohandatud paigalduse, "
-"eriti just valida, millist töökeskkonda kasutama hakata."
+"Klassikaline paigaldusandmekandja. Selle käivitamise järel asutakse kohe "
+"paigaldamise juurde ning te saate valida, mida paigaldada ja kuidas süsteemi "
+"vastavalt seadistada. See annab maksimaalse paindlikkuse ja lubab luua "
+"kohandatud paigalduse, eriti just valida, millist töökeskkonda kasutama "
+"hakata."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:26
@@ -3150,10 +3146,9 @@ msgid ""
 "installing it, to see what you will get after installation.  The "
 "installation process is simpler, but you get lesser choices."
 msgstr ""
-"Live-andmekandja: sel juhul saab andmekandja pealt käivitada "
-"toimiva Mageia süsteemi ilma seda paigaldamata, et näiteks "
-"näha, mida üldse pakutakse. Paigaldamine on lihtsam, aga "
-"ka valikuid on vähem."
+"Live-andmekandja: sel juhul saab andmekandja pealt käivitada toimiva Mageia "
+"süsteemi ilma seda paigaldamata, et näiteks näha, mida üldse pakutakse. "
+"Paigaldamine on lihtsam, aga ka valikuid on vähem."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:33
@@ -3455,10 +3450,9 @@ msgid ""
 "them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
 "Then this window appears:"
 msgstr ""
-"md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. "
-"Kasutada tuleks ainult üht neist. Hoidke üks neist varuks <link "
-"linkend=\"integrity\">edasiseks kasutamiseks</link>. Seejärel "
-"ilmub selline aken:"
+"md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada "
+"tuleks ainult üht neist. Hoidke üks neist varuks <link linkend=\"integrity"
+"\">edasiseks kasutamiseks</link>. Seejärel ilmub selline aken:"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:304
@@ -3624,8 +3618,8 @@ msgid ""
 "- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> using "
 "the \"ISO image\" option;"
 msgstr ""
-"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> valikuga "
-"\"ISO image\";"
+"- <link ns4:href=\"http://rufus.akeo.ie/?locale=en_US\">Rufus</link> "
+"valikuga \"ISO image\";"
 
 #. type: Content of: <section><section><section><section><para>
 #: en/SelectAndUseISOs2.xml:389
@@ -3647,8 +3641,8 @@ msgid ""
 "It is potentially *dangerous* to do this by hand. You risk to overwrite a "
 "disc partition if you get the device-ID wrong."
 msgstr ""
-"Käsitsi toimetamine on potentsiaalselt *ohtlik*. Kui seadme ID valesti "
-"anda, võib ketta partitsiooni sootuks üle kirjutada."
+"Käsitsi toimetamine on potentsiaalselt *ohtlik*. Kui seadme ID valesti anda, "
+"võib ketta partitsiooni sootuks üle kirjutada."
 
 #. type: Content of: <section><section><section><section><para>
 #: en/SelectAndUseISOs2.xml:401
@@ -3700,9 +3694,9 @@ msgid ""
 "code>: at end, you see the device name starting with <emphasis>sd</"
 "emphasis>, and <emphasis>sdd</emphasis> in this case:"
 msgstr ""
-"Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: "
-"lõpus näeb seadme nime, mille alguses seisab <emphasis>sd</emphasis>, "
-"antud juhul <emphasis>sdd</emphasis>:"
+"Teine võimalus on leida seadme nimi käsuga <code>dmesg</code>: lõpus näeb "
+"seadme nime, mille alguses seisab <emphasis>sd</emphasis>, antud juhul "
+"<emphasis>sdd</emphasis>:"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
 #: en/SelectAndUseISOs2.xml:439
@@ -3710,21 +3704,16 @@ msgstr ""
 msgid ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3734,21 +3723,16 @@ msgid ""
 msgstr ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 "
-"PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 "
-"GB/2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3803,8 +3787,8 @@ msgstr "Eemaldage USB-pulk, kõik on valmis"
 msgid "Select your Country / Region"
 msgstr "Riigi / piirkonna valimine"
 
-#.  2012-12-25 marja - moved this section out of misc-params
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectCountry.xml:21
 msgid ""
@@ -4003,9 +3987,8 @@ msgid ""
 "The default one is selected according to your language and timezone "
 "previously selected."
 msgstr ""
-"Teil palutakse määrata klaviatuuripaigutus, mida soovite Mageias "
-"kasutada. Vaikimisi valitu vastab keelele ja ajavööndile, mille "
-"varem valisite."
+"Teil palutakse määrata klaviatuuripaigutus, mida soovite Mageias kasutada. "
+"Vaikimisi valitu vastab keelele ja ajavööndile, mille varem valisite."
 
 #. type: Content of: <section><info><title>
 #: en/selectKeyboard.xml:14
@@ -4172,10 +4155,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Hiire valimine"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
 #.  adding some "real" text now that we know the page shows up in the right place
-#.  marja 2012-04-24 adding screenshot
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4217,22 +4200,26 @@ msgstr "Alglaadimismenüü kirje lisamine või muutmine"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "BIOS-e süsteemiga"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4243,7 +4230,7 @@ msgstr ""
 "selle kohale ilmuvas ekraanis."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4251,25 +4238,24 @@ msgid ""
 "instead."
 msgstr ""
 "Kui olete valinud alglaaduriks <code>Grub 2</code>, ei saa te selle "
-"tööriistaga "
-"sel sammul kirjeid muuta, nii et klõpsake 'Edasi'. Teil tuleb käsitsi muuta "
-"faili "
-"<code>/boot/grub2/custom.cfg</code> või kasutada tööriista "
-"<code>grub-customizer</code>."
+"tööriistaga sel sammul kirjeid muuta, nii et klõpsake 'Edasi'. Teil tuleb "
+"käsitsi muuta faili <code>/boot/grub2/custom.cfg</code> või kasutada "
+"tööriista <code>grub-customizer</code>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4278,14 +4264,14 @@ msgstr ""
 "kastikeses, millega see muudetakse vaikimisi kirjeks."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 "Kirje nimele võib lisada versiooninumbri, aga nime võib ka täielikult muuta."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4294,7 +4280,7 @@ msgstr ""
 "kasutamata võimaluse midagi valida."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4304,12 +4290,12 @@ msgstr ""
 "täiesti kindel ei ole."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "UEFI süsteemiga"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4317,24 +4303,22 @@ msgid ""
 "do here, is to choose the default entry in the drop down list."
 msgstr ""
 "Sel juhul on alglaaduriks valitud Grub2-efi ning te ei saa selle tööriistaga "
-"sel "
-"sammul kirjeid muuta. Teil tuleb käsitsi muuta faili <code>/boot/grub2/custom."
-"cfg</code> või kasutada tööriista <code>grub-customizer</code>. Ainuke "
-"asi, mida siin teha saab, on valida rippmenüüst vaikimisi kirje."
+"sel sammul kirjeid muuta. Teil tuleb käsitsi muuta faili <code>/boot/grub2/"
+"custom.cfg</code> või kasutada tööriista <code>grub-customizer</code>. "
+"Ainuke asi, mida siin teha saab, on valida rippmenüüst vaikimisi kirje."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
 "boot loader."
 msgstr ""
-"Klõpsu järel nupule <guibutton>Edasi</guibutton> laseb järgmine "
-"rippmenüü valida Grub2 ekraanilahutuse (kuna see on graafiline "
-"alglaadur)."
+"Klõpsu järel nupule <guibutton>Edasi</guibutton> laseb järgmine rippmenüü "
+"valida Grub2 ekraanilahutuse (kuna see on graafiline alglaadur)."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4349,17 +4333,22 @@ msgstr "Alglaaduri põhiseadistused"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4368,7 +4357,7 @@ msgstr ""
 "paigaldusprogramm automaatselt, saab siin neid muuta."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4379,17 +4368,17 @@ msgstr ""
 "Mageial luua uus."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Mageia graafiline menüü näeb kena välja :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Mageia alglaaduri kasutamine"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4402,7 +4391,7 @@ msgstr ""
 "alglaadimismenüüsse."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4411,17 +4400,17 @@ msgstr ""
 "uuemat alglaadurit GRUB2."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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."
 msgstr ""
-"Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu "
-"ei toeta ega tunne neid ära, kui kasutada vaikimisi GRUBi alglaadurit."
+"Linuxi süsteeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei toeta "
+"ega tunne neid ära, kui kasutada vaikimisi GRUBi alglaadurit."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4430,12 +4419,12 @@ msgstr ""
 "paigaldamise ajal kokkuvõtteleheküljel."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Olemasoleva alglaaduri kasutamine"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4448,7 +4437,7 @@ msgstr ""
 "muuta alglaaduri paigaldamise asukohta."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4459,12 +4448,12 @@ msgstr ""
 "partitsioneerimisetapil, nt sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Et asi selge oleks: sda on seade, sda7 aga partitsioon."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4476,7 +4465,7 @@ msgstr ""
 "ekraanile."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4491,12 +4480,12 @@ msgstr ""
 "dokumentatsiooni."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Alglaaduri täpsemad valikud"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4509,7 +4498,7 @@ msgstr ""
 "käivitumisel</guilabel>. See aitab ruumi mõnevõrra kokku hoida."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4518,16 +4507,20 @@ msgstr ""
 "valida alglaadurit, kuna saadaval on ainult Grub2-efi."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4537,35 +4530,34 @@ msgid ""
 "several ESPs, only one is advised and enough whatever the number of "
 "operating systems you have."
 msgstr ""
-"Kui Mageia on esimene süsteem, mis teie arvutisse paigaldatakse, "
-"loob paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri "
-"(Grub2-efi) tarbeks. Kui arvutisse on juba paigaldatud UEFI "
-"operatsioonisüsteeme (näiteks Windows 8), tuvastab Mageia "
-"paigaldusprogramm Windowsi loodud ESP ja lisab sellele Grub2-efi. "
-"ESP-sid võib küll põhimõtteliselt olla ka mitu, aga väga soovitatav "
-"on siiski kasutada ainult üht sõltumata sellest, kui palju on arvutis "
-"operatsioonisüsteeme."
+"Kui Mageia on esimene süsteem, mis teie arvutisse paigaldatakse, loob "
+"paigaldusprogramm ESP (EFI süsteemse partitsiooni) alglaaduri (Grub2-efi) "
+"tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonisüsteeme "
+"(näiteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP "
+"ja lisab sellele Grub2-efi. ESP-sid võib küll põhimõtteliselt olla ka mitu, "
+"aga väga soovitatav on siiski kasutada ainult üht sõltumata sellest, kui "
+"palju on arvutis operatsioonisüsteeme."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
-"Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et "
-"teate, mida teete."
+"Ärge muutke \"Alglaadimisseadet\", kui te pole täiesti kindel, et teate, "
+"mida teete."
 
 #. type: Content of: <section><info><title>
 #: en/setupSCSI.xml:11
 msgid "Setup SCSI"
 msgstr "SCSI seadistamine"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
 #.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
-#.        Mdv doc instead of on our setupSCSI file
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4605,7 +4597,7 @@ msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
 msgid "Sound Configuration"
 msgstr "Heli seadistamine"
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4682,12 +4674,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Kõvaketta vormindamise kinnitamine"
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
 #.     hard disk." with "if you are not sure about your choice", because I'm sure I
-#.     saw this help screen when I had only one HD
-#.  2013-05-05 marja added screenshot
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
@@ -4743,9 +4735,8 @@ msgid ""
 "You get this screen if you selected \"Boot Mageia\". If not, you get the "
 "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
 msgstr ""
-"See ekraan ilmub, kui valida \"Mageia laadimine\". Kui seda ei juhtu, "
-"jõuate sammu <link linkend=\"doPartitionDisks\">Partitsioneerimine</link> "
-"juurde."
+"See ekraan ilmub, kui valida \"Mageia laadimine\". Kui seda ei juhtu, jõuate "
+"sammu <link linkend=\"doPartitionDisks\">Partitsioneerimine</link> juurde."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/testing.xml:28
@@ -4759,11 +4750,10 @@ msgid ""
 "by Mageia. You can check if all devices have a driver in the Hardware "
 "section of the Mageia Control Center. You can test the most current devices:"
 msgstr ""
-"Üks Live-režiimi eesmärke on järele proovida, kas Mageia suudab "
-"riistvara korrektselt hallata. Sel juhul saab näiteks Mageia "
-"juhtimiskeskuse riistvara sektsioonis kontrollida, kas ikka kõigil "
-"seadmetel on draiver olemas. Järele saab proovida enamiku "
-"seadmeid:"
+"Üks Live-režiimi eesmärke on järele proovida, kas Mageia suudab riistvara "
+"korrektselt hallata. Sel juhul saab näiteks Mageia juhtimiskeskuse riistvara "
+"sektsioonis kontrollida, kas ikka kõigil seadmetel on draiver olemas. Järele "
+"saab proovida enamiku seadmeid:"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
 #: en/testing.xml:38
@@ -4808,8 +4798,7 @@ msgstr ""
 #: en/testing.xml:66
 msgid "The configuration settings you made here are kept for the installation."
 msgstr ""
-"Siin langetatud seadistamisvalikud jäetakse paigaldamise käigus "
-"meelde."
+"Siin langetatud seadistamisvalikud jäetakse paigaldamise käigus meelde."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/testing.xml:72
@@ -4835,8 +4824,8 @@ msgid ""
 msgstr ""
 "Mageia LiveCD või LiveDVD paigaldamiseks kõvakettale või SSD-kettale "
 "klõpsake lihtsalt ikoonile \"Paigaldamine kõvakettale\". Ilmub näidatav "
-"ekraan ja seejärel samm <link linkend=\"doPartitionDisks\">"
-"Partitsioneerimine</link>, nagu ka otsepaigalduse korral."
+"ekraan ja seejärel samm <link linkend=\"doPartitionDisks"
+"\">Partitsioneerimine</link>, nagu ka otsepaigalduse korral."
 
 #. type: Content of: <section><info><title>
 #: en/uninstall-Mageia.xml:3
@@ -4939,15 +4928,16 @@ msgid ""
 "hardware."
 msgstr ""
 "Sellel sammul otsib paigaldusprogramm tarbetuid lokaadi- ja "
-"riistvarapakette. Seejärel tehakse ettepanek need kustutada. "
-"See on üldiselt hea mõte, kui te just ei valmistu paigalduseks "
-"sootuks teistsugusel riistvaral."
+"riistvarapakette. Seejärel tehakse ettepanek need kustutada. See on üldiselt "
+"hea mõte, kui te just ei valmistu paigalduseks sootuks teistsugusel "
+"riistvaral."
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4958,9 +4948,34 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
-"Järgmisel sammul kopeeritakse failid kõvakettale. See võtab "
-"mõne minuti aega. Lõpus näeb mõnda aega tühja ekraani, "
-"millest ei tasu end heidutada lasta."
+"Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti "
+"aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada "
+"lasta."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
 
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index b9f17116..abf8305a 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-07-02 08:39+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -568,22 +568,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Abiatu Mageia Zuzeneko sistema bezala"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Euskarria abiarazten"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Diskotik"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -594,19 +594,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "USB gailu batetik"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -616,27 +616,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy moduan"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Lehen pantaila BIOS moduan abiarazten den bitartean"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -645,13 +646,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -659,31 +660,31 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Menuaren azpikaldean, Abio Aukerak daude:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Laguntza. Azaldu aukerak \"splash\", \"APM\", \"acpi\" eta \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Hizkuntza. Aukeratu pantailen hizkuntza."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Pantailaren bereizmena. Aukeratu testua, 640x400, 800x600, 1024x728 "
 "artean"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -698,7 +699,7 @@ msgstr ""
 "eskuragarri."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -709,7 +710,7 @@ msgstr ""
 "eskatzen du."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -718,33 +719,34 @@ msgstr ""
 "aukerak zehazteko modu bat da."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "UEFI moduan"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Lehen pantaila diskotik UEFI sistema abiaraztean"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -752,7 +754,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2453,31 +2455,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Ondoren, sakatu <guibutton>Hurrengoa</guibutton> jarraitzeko"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Sarrera pantaila"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM sarrera pantaila"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Azkenik, saio hasiera pantailara zatoz."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2485,10 +2488,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4107,22 +4110,26 @@ msgstr "Gegitu edo Aldatu Abio Menuko Sarrera"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Bios sistemarekin"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4133,7 +4140,7 @@ msgstr ""
 "aukerak aldatzen."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4146,18 +4153,19 @@ msgstr ""
 "customizer</code> erabili behar duzu."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4166,14 +4174,14 @@ msgstr ""
 "lehenetsi gisa markatzea."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 "Bertsio zenbaki egokia, edo izenez erabat sarrerari gehitu diezaiokezu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4182,19 +4190,19 @@ msgstr ""
 "kargatzen duena."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "UEFI sistemarekin"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4203,7 +4211,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4211,7 +4219,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4226,17 +4234,22 @@ msgstr "Abio kargatzailearen aukera nagusiak"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4245,7 +4258,7 @@ msgstr ""
 "ezberdinak nahiago badituzu, hemen alda ditzakezu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4256,17 +4269,17 @@ msgstr ""
 "sortzea erabaki behar duzu."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "The mageia grafiko menu politak ditu:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Mageia abio kargatzailea erabiliz"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4275,7 +4288,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4284,7 +4297,7 @@ msgstr ""
 "abioko kargatzailea gisa."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4292,7 +4305,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4301,12 +4314,12 @@ msgstr ""
 "kargatzailea hemen erabiltzea da konponbiderik onena."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Existitzen den abio kargatzaile bat erabiliz"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4319,7 +4332,7 @@ msgstr ""
 "instalazio tokia aldatzen utziko dizu."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4327,12 +4340,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Argi izan, sda gailu bat da, sda7 gailuaren partizio bat da."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4343,7 +4356,7 @@ msgstr ""
 "instalatzailera itzuliarazten dizu."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4357,12 +4370,12 @@ msgstr ""
 "sistema eragilearen dokumentazioa."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Abioko kargatzailearen aukera aurreratuak"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4375,23 +4388,27 @@ msgstr ""
 "toki libre apur bat mantentzen laguntzen du."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4403,7 +4420,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4777,9 +4794,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4790,3 +4808,28 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 14902b26..8a93ebca 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-20 10:24+0000\n"
 "Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -603,22 +603,22 @@ msgstr ""
 "l'heure."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Démarrer Mageia comme système Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Démarrer le médium"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "A partir d'un disque dur"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -636,7 +636,7 @@ msgstr ""
 "devra démarrer."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -645,12 +645,12 @@ msgstr ""
 "configuré, vous obtenez l'un ou l'autre des deux écrans ci-dessous."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "A partir d'un périphérique USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -666,27 +666,28 @@ msgstr ""
 "devra démarrer."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "Dans le mode Bios, csm ou legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Premier écran lors du démarrage en mode BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "Dans le menu du milieu, vous avez le choix entre trois actions : "
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -699,7 +700,7 @@ msgstr ""
 "réalisé, vous pourrez procéder à l'installation sur le disque dur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -707,7 +708,7 @@ msgstr ""
 "dur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -718,31 +719,31 @@ msgstr ""
 "n'est connecté. (Ne fonctionne pas avec Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Dans le menu inférieur, vous disposez des options de démarrage :"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Aide. Explique les options \"splash\", \"apm\", \"acpi\" et \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Langue. Sélectionner la langue à afficher sur les écrans."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Résolution de l'écran. Sélectionner entre texte, 640x400, 800x600, "
 "1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -757,7 +758,7 @@ msgstr ""
 "disponible sur le serveur avec cette option."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -768,7 +769,7 @@ msgstr ""
 "processus d'installation."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -777,27 +778,28 @@ msgstr ""
 "votre matériel et aux pilotes à utiliser."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "En mode UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 "Premier écran lors du démarrage à partir du disque dur sur les systèmes UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -806,7 +808,7 @@ msgstr ""
 "effectuer son installation (second choix)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -817,7 +819,7 @@ msgstr ""
 "\"USB\". Vous devez les sélectionner."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2580,31 +2582,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Cliquer sur <guibutton>Suivant</guibutton> pour continuer"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Ecran de connexion"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Ecran de connexion KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Au final, vous arrivez sur l'écran de connexion."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2616,10 +2619,11 @@ msgstr ""
 "dès maintenant commencer à utiliser votre installation de Mageia."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Vous pouvez trouver une autre partie de notre documentation dans <link "
 "linkend=\"https://wiki.mageia.org/en/Documentation-fr\">le wiki Mageia</"
@@ -4331,22 +4335,26 @@ msgstr "Ajouter ou Modifier une Entrée de Menu de Démarrage"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Avec un système BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4358,7 +4366,7 @@ msgstr ""
 "la fenêtre qui s'ouvre à ce moment."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4372,18 +4380,19 @@ msgstr ""
 "place."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4393,7 +4402,7 @@ msgstr ""
 "risques."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4401,7 +4410,7 @@ msgstr ""
 "renommer complètement."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4410,7 +4419,7 @@ msgstr ""
 "pendant la phase de démarrage du système."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4419,12 +4428,12 @@ msgstr ""
 "N'essayez pas quoi que ce soit sans savoir ce que vous faites."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Avec un système UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4438,7 +4447,7 @@ msgstr ""
 "c'est choisir l'entrée par défaut dans la liste déroulante."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4449,7 +4458,7 @@ msgstr ""
 "le chargeur de démarrage graphique."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4464,17 +4473,22 @@ msgstr "Principales options du chargeur de démarrage"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4483,7 +4497,7 @@ msgstr ""
 "de ceux choisis automatiquement par l'installateur, les changer ici."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4494,17 +4508,17 @@ msgstr ""
 "ou autoriser Mageia à en créer un autre. "
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Les menus graphiques de Mageia sont jolis :"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Utiliser un chargeur de démarrage Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4517,7 +4531,7 @@ msgstr ""
 "dans votre nouveau menu de démarrage Mageia."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4526,7 +4540,7 @@ msgstr ""
 "plus de GRUB legacy et Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4537,7 +4551,7 @@ msgstr ""
 "démarrage GRUB est utilisé."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4546,12 +4560,12 @@ msgstr ""
 "est disponible pendant l'installation à la page du résumé."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Utiliser un chargeur de démarrage existant.  "
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4564,7 +4578,7 @@ msgstr ""
 "permet de modifier le lieu d'installation du chargeur de démarrage."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4575,14 +4589,14 @@ msgstr ""
 "choisi lors de la phase de partitionnement précédente, par exemple sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Pour être clair, sda est un périphérique, sda7 est une partition de ce "
 "périphérique."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4593,7 +4607,7 @@ msgstr ""
 "l'écran de l'installateur."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4608,12 +4622,12 @@ msgstr ""
 "Voir la documentation du système d'exploitation en question."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Option avancée du chargeur de démarrage "
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4627,7 +4641,7 @@ msgstr ""
 "libre."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4637,16 +4651,20 @@ msgstr ""
 "disponible."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4666,7 +4684,7 @@ msgstr ""
 "systèmes d'exploitation que vous utilisez."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Ne modifiez pas le \"Périphérique de démarrage\", à moins que vous ne "
@@ -5067,9 +5085,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -5083,3 +5102,28 @@ msgstr ""
 "La prochaine étape consistera à copier les fichiers sur le disque dur. Ceci "
 "peut prendre quelques minutes. A la fin, vous verrez s'afficher un écran "
 "vide pendant un certain temps, c'est normal."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index ef61602b..476e44df 100644
--- a/docs/installer/hr.po
+++ b/docs/installer/hr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2015-11-21 11:17+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -544,22 +544,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -570,19 +570,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -592,30 +592,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -624,13 +624,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -638,28 +638,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -669,7 +669,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -677,41 +677,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -719,7 +719,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2125,33 +2125,33 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
 "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
 "\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2159,10 +2159,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3527,19 +3527,26 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3547,7 +3554,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3556,47 +3563,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3605,7 +3615,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3613,7 +3623,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
@@ -3629,21 +3639,27 @@ msgstr "Glavne postavke bootloadera"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -3651,17 +3667,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -3670,14 +3686,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -3685,19 +3701,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -3706,7 +3722,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -3714,12 +3730,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -3727,7 +3743,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -3737,12 +3753,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3751,24 +3767,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -3780,7 +3797,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4105,8 +4122,8 @@ msgstr ""
 #: en/unused.xml:25
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
@@ -4118,6 +4135,14 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center"
+#~ "\" format=\"PNG\" ></imagedata> </imageobject>"
+
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
diff --git a/docs/installer/id.po b/docs/installer/id.po
index 55302870..7a28ff3a 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2015-05-25 04:50+0000\n"
 "Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -580,23 +580,23 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 #, fuzzy
 msgid "Booting the medium"
 msgstr "Media CD hanya-boot"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -607,19 +607,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -629,28 +629,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -659,13 +659,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -673,28 +673,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -704,7 +704,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -712,41 +712,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -754,7 +754,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2458,32 +2458,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Lalu tekan <guibutton>Selanjutnya</guibutton> untuk melanjutkan"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2491,11 +2491,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 #, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Informasi lebih lengkap ada di <link ns4:href=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">wiki Mageia</link>."
@@ -4128,22 +4128,26 @@ msgstr "Tambah atau Modifikasi Entri Menu Boot"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4154,7 +4158,7 @@ msgstr ""
 "mengedit layar yang muncul di atasnya."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 #, fuzzy
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
@@ -4169,18 +4173,19 @@ msgstr ""
 "customizer</code> saja."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4189,14 +4194,14 @@ msgstr ""
 "dan memilih kotak untuk membuat entri menjadi bawaan."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 "Anda bisa menambah nomor versi entri yang tepat, atau mengganti namanya."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4205,7 +4210,7 @@ msgstr ""
 "tidak memilih saat mulai berjalan."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 #, fuzzy
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
@@ -4215,12 +4220,12 @@ msgstr ""
 "apapun yang Anda tidak mengerti."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 #, fuzzy
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
@@ -4235,7 +4240,7 @@ msgstr ""
 "customizer</code> saja."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4243,7 +4248,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
@@ -4259,17 +4264,20 @@ msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4278,7 +4286,7 @@ msgstr ""
 "secara otomatis oleh installer, Anda bisa mengubahnya di sini."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4289,18 +4297,18 @@ msgstr ""
 "atau membiarkan Mageia membuatnya."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 #, fuzzy
 msgid "The Mageia graphical menus are nice :"
 msgstr "Menu grafis Mageia sangat cantik :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Gunakan bootloader Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 #, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
@@ -4314,7 +4322,7 @@ msgstr ""
 "baru."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4323,7 +4331,7 @@ msgstr ""
 "tambahan GRUB legacy dan Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
@@ -4334,7 +4342,7 @@ msgstr ""
 "(legacy) dan tidak akan dikenali jika bootloader GRUB bawaan digunakan."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4343,12 +4351,12 @@ msgstr ""
 "Ringkasan selama instalasi."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Gunakan bootloader yang ada"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4361,7 +4369,7 @@ msgstr ""
 "mengubah lokasi instalasi bootloader."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 #, fuzzy
 msgid ""
 "Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
@@ -4373,14 +4381,14 @@ msgstr ""
 "pemartisian sebelumnya, misalnya sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Supaya jelas, sda adalah perangkat, sda7 adalah partisi pada perangkat "
 "tersebut."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4391,7 +4399,7 @@ msgstr ""
 "akan membawa Anda kembali ke layar installer."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4405,12 +4413,12 @@ msgstr ""
 "menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Pilihan lanjutan bootloader"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4423,7 +4431,7 @@ msgstr ""
 "dijalankan ulang</guilabel>. Ini akan membantu menjaga ruang kosong."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 #, fuzzy
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
@@ -4434,16 +4442,19 @@ msgstr ""
 "tersedia"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4455,7 +4466,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4830,8 +4841,8 @@ msgstr ""
 #: en/unused.xml:25
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
@@ -4842,6 +4853,31 @@ msgid ""
 msgstr ""
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/installer/it.po b/docs/installer/it.po
index 6d4aaeb8..aeee0aae 100644
--- a/docs/installer/it.po
+++ b/docs/installer/it.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-25 10:30+0000\n"
 "Last-Translator: Simona Busalacchi <simobusalacchi.sb@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -510,22 +510,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -536,19 +536,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -558,27 +558,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
-msgstr ""
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -587,13 +588,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -601,28 +602,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -632,7 +633,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -640,38 +641,42 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -679,7 +684,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2175,29 +2180,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Poi premi <guibutton>Avanti</guibutton> per continuare"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2205,10 +2213,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3747,21 +3755,21 @@ msgstr "Aggiungi o modifica una Boot Menu Entry"
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3769,7 +3777,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3778,50 +3786,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3830,7 +3839,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3838,7 +3847,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -3852,13 +3861,15 @@ msgstr "Opzioni principali del bootloader"
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3867,7 +3878,7 @@ msgstr ""
 "automatico dall'installer puoi modificare da qua."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -3878,17 +3889,17 @@ msgstr ""
 "Mageia di crearne uno nuovo."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -3897,7 +3908,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3906,7 +3917,7 @@ msgstr ""
 "Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -3914,7 +3925,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3923,12 +3934,12 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Usare un bootloader esistente"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -3937,7 +3948,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -3945,14 +3956,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Per essere chiari, sda è il dispositivo, sda7 la partizione su quel "
 "dispositivo."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -3960,7 +3971,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -3970,12 +3981,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Opzioni avanzate del Bootloader"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3984,21 +3995,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
+"png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4010,7 +4026,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4346,10 +4362,11 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/ja.po b/docs/installer/ja.po
index 0d438588..84522343 100644
--- a/docs/installer/ja.po
+++ b/docs/installer/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-27 16:17+0000\n"
 "Last-Translator: ook rio <riokoko5@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
@@ -459,22 +459,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -485,19 +485,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -507,27 +507,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -536,13 +536,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -550,28 +550,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -581,7 +581,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -589,38 +589,38 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -628,7 +628,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -1985,29 +1985,29 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2015,10 +2015,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3373,19 +3373,28 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3393,7 +3402,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3402,47 +3411,47 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3451,7 +3460,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3459,7 +3468,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -3472,21 +3481,29 @@ msgstr "ブートローダのメインオプション"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -3494,17 +3511,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -3513,14 +3530,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -3528,19 +3545,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -3549,7 +3566,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -3557,12 +3574,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -3570,7 +3587,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -3580,12 +3597,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3594,21 +3611,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -3620,7 +3644,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -3935,8 +3959,8 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index da901e52..0ce19d67 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-07-06 15:31+0000\n"
 "Last-Translator: Dennis Holierhoek <dennis.hh@hotmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -588,22 +588,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr "In het geavanceerd-tabblad vind u meer klokinstellingsopties."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Start Mageia als Live-systeem"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Het medium opstarten"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Van een DVD"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -618,7 +618,7 @@ msgstr ""
 "éénmalig van opstartapparaat te wisselen, raadpleeg uw pc-handleiding."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -627,12 +627,12 @@ msgstr ""
 "krijgt u één van de twee onderstaande schermen."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Van een USB-apparaat"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -647,27 +647,28 @@ msgstr ""
 "geeft vanaf welk apparaat u de computer wilt booten."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "In BIOS/CSM/Legacy-modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Eerste scherm na starten in BIOS-modus"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "In het middelste menu, heeft u de keuze tussen drie acties:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -680,7 +681,7 @@ msgstr ""
 "u verdergaan naar de installatie op een harde schijf"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -688,7 +689,7 @@ msgstr ""
 "installeren"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -699,28 +700,28 @@ msgstr ""
 "aangesloten. (werkt niet met Mageia 5)"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "In het onderste menu, zijn de opstartopties:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 - Hulp. Leg de opties \"splash\", \"apm\", \"acpi\" en \"lde\" uit"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Taal. Kies de weergegeven taal van de schermen"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -730,7 +731,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -738,40 +739,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "In UEFI-modus"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -779,7 +781,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2500,31 +2502,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Klik daarna op <guibutton>Volgende</guibutton> om verder te gaan."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Aanmeldscherm"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM-aanmeldscherm"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Tenslotte komt u bij het aanmeldscherm"
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2532,10 +2535,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Meer documentatie vindt u in <link ns4:href=\"https://wiki.mageia.org/en/"
 "Documentation\">de Mageia wiki</link>."
@@ -4177,22 +4181,26 @@ msgstr "Wijzig een opstartmenu-ingang of voeg er een toe"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4204,7 +4212,7 @@ msgstr ""
 "gegevens in het scherm dat zich op de voorgrond opent."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4217,18 +4225,19 @@ msgstr ""
 "<code>grub-customizer</code> gebruiken."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4238,7 +4247,7 @@ msgstr ""
 "standaard ingang wordt."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4246,7 +4255,7 @@ msgstr ""
 "hernoemen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4255,7 +4264,7 @@ msgstr ""
 "maakt tijdens het opstarten van uw computer."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4264,12 +4273,12 @@ msgstr ""
 "kunt opstarten. Probeer alstublieft niets zonder precies te weten wat u doet."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4282,7 +4291,7 @@ msgstr ""
 "u hier kunt doen is de standaard ingang kiezen in de uitvouwlijst."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4290,7 +4299,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4305,17 +4314,22 @@ msgstr "Algemene opties voor de opstartlader"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4324,7 +4338,7 @@ msgstr ""
 "hier veranderen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4335,17 +4349,17 @@ msgstr ""
 "of dat u Mageia toestaat een nieuwe te creëren."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "De Mageia grafische menu's zijn mooi :"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "De Mageia-opstartlader gebruiken"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4358,7 +4372,7 @@ msgstr ""
 "opstartmenu toe te voegen."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4367,7 +4381,7 @@ msgstr ""
 "opstartlader te nemen, ook GRUB2 als keuze aan."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4378,7 +4392,7 @@ msgstr ""
 "GRUB opstartlader gebruikt wordt."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4387,12 +4401,12 @@ msgstr ""
 "tijdens het installeren in de Overzichtspagina beschikbaar is."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Een bestaande opstartlader gebruiken"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4405,7 +4419,7 @@ msgstr ""
 "de locatie kunt veranderen waar de opstartlader geplaatst wordt."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4416,12 +4430,12 @@ msgstr ""
 "bijvoorbeeld \"sda7\"."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Ter verduidelijking, sda is een apparaat, sda7 is een partitie."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4432,7 +4446,7 @@ msgstr ""
 "naar het installatiescherm."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4447,12 +4461,12 @@ msgstr ""
 "documentatie van het betreffende besturingssysteem."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Geavanceerde optie voor de opstartlader"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4465,7 +4479,7 @@ msgstr ""
 "guilabel>. Dit helpt om wat vrije ruimte te behouden."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4474,16 +4488,20 @@ msgstr ""
 "opstartlader kiezen, omdat enkel Grub2-efi beschikbaar is."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4502,7 +4520,7 @@ msgstr ""
 "laten. Één is genoeg, ongeacht het aantal besturingssystemen dat u heeft."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr "Wijzig het \"Opstartapparaat\" niet, tenzij u weet wat u doet."
 
@@ -4881,9 +4899,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4896,3 +4915,28 @@ msgid ""
 msgstr ""
 "De volgende stap is het kopiëren van bestanden naar de harde schijf. Dit "
 "duurt enige minuten. Dan ziet u een poos een blanco scherm, dat is normaal."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index a10b15bb..20a319be 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2015-11-18 14:56+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -560,22 +560,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -586,19 +586,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -608,30 +608,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -640,13 +640,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -654,28 +654,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -685,7 +685,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -693,41 +693,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -735,7 +735,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2290,33 +2290,33 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Kliknij <guibutton>Dalej</guibutton> aby kontynuować"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
 "\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
 "\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2324,10 +2324,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3789,19 +3789,26 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3809,7 +3816,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3818,47 +3825,50 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3867,7 +3877,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3875,7 +3885,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
@@ -3891,21 +3901,27 @@ msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -3913,17 +3929,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -3932,14 +3948,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -3947,19 +3963,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -3968,7 +3984,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -3976,12 +3992,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -3989,7 +4005,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -3999,12 +4015,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4013,24 +4029,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4042,7 +4060,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4380,8 +4398,8 @@ msgstr ""
 #: en/unused.xml:25
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
 "\" /> </imageobject>"
@@ -4393,6 +4411,14 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+#~ "\" /> </imageobject>"
+
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 65a46f64..f305e5e1 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-05-17 01:05+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -593,22 +593,22 @@ msgstr ""
 "relógio."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Boot no sistema Live Mageia"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Iniciando os meios"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "A partir de um disco"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -626,7 +626,7 @@ msgstr ""
 "arrancar."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -635,12 +635,12 @@ msgstr ""
 "verá uma das duas telas abaixo."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "A partir de um dispositivo USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -656,27 +656,28 @@ msgstr ""
 "do qual o computador irá iniciar."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "No modo BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Primeira tela durante a inicialização no modo BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "No menu central, você tem a escolha entre três ações:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -689,7 +690,7 @@ msgstr ""
 "feita, você pode ir para a instalação em um disco rígido."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -697,7 +698,7 @@ msgstr ""
 "rígido."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -708,29 +709,29 @@ msgstr ""
 "USB) ligado. (Não funciona com Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "No menu inferior estão as opções de inicialização:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 - Ajuda. Explicar as opções \"splash\", \"APM\", \"ACPI\" e \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Linguagem. Escolha o idioma das telas de exibição."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Resolução da tela. Escolha entre texto, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -745,7 +746,7 @@ msgstr ""
 "com esta opção."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -756,7 +757,7 @@ msgstr ""
 "durante o processo de instalação."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -765,27 +766,28 @@ msgstr ""
 "acordo com o seu hardware e os drivers para usar."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "No modo UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 "Primeira tela durante a inicialização do sistema UEFI a partir do disco"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -794,7 +796,7 @@ msgstr ""
 "para processar a instalação (segunda opção)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -805,7 +807,7 @@ msgstr ""
 "Você tem que escolhê-los."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2544,31 +2546,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Em seguida, pressione <guibutton>Próximo</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Tela de Login"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM login screen"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Finalmente, você chegará à tela de login."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2579,10 +2582,11 @@ msgstr ""
 "usou. Agora você pode começar a usar a sua instalação Mageia."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Você pode encontrar outra parte de nossa documentação em <link linkend="
 "\"https://wiki.mageia.org/en/Category:Documentation\">o wiki Mageia</link>."
@@ -4274,22 +4278,26 @@ msgstr "Adicionando ou Modificando uma Entrada do Menu de Inicialização"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Com um sistema Bios"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4300,7 +4308,7 @@ msgstr ""
 "Menu de Inicialização</emphasis> e editando a janela que abrir em cima dela."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4313,18 +4321,19 @@ msgstr ""
 "cfg</code> ou usar <code>grub-customizer</code> em seu lugar."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4333,7 +4342,7 @@ msgstr ""
 "de uma entrada e selecionar a caixa de uma entrada para torná-la padrão."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4341,7 +4350,7 @@ msgstr ""
 "completamente."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4350,7 +4359,7 @@ msgstr ""
 "durante a inicialização."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4359,12 +4368,12 @@ msgstr ""
 "favor, não tente algo sem saber o que está fazendo."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Com um sistema UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4378,7 +4387,7 @@ msgstr ""
 "a entrada padrão na lista suspensa."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4389,7 +4398,7 @@ msgstr ""
 "carregador de inicialização gráfico."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4404,17 +4413,22 @@ msgstr "Principais Opções do Gerenciador de Inicialização"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>\t\t\t\t"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4424,7 +4438,7 @@ msgstr ""
 "instalador, você pode alterá-las aqui."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4435,17 +4449,17 @@ msgstr ""
 "inicialização existente, ou permitir que a Mageia crie um novo."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "O menu gráfico Mageia é agradável:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Usando o Gerenciador de Inicialização da Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4458,7 +4472,7 @@ msgstr ""
 "inicialização do Mageia."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4467,7 +4481,7 @@ msgstr ""
 "opcional, em adição ao GRUB original e Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4478,7 +4492,7 @@ msgstr ""
 "padrão é usado."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4487,12 +4501,12 @@ msgstr ""
 "que está disponível na página de resumo durante a instalação."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Usando um Gerenciador de Inicialização existente"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4506,7 +4520,7 @@ msgstr ""
 "Gerenciador de Inicialização."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4517,12 +4531,12 @@ msgstr ""
 "fase de particionamento mais cedo, por exemplo, sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Para ficar claro, sda é um dispositivo, sda7 é uma partição."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4533,7 +4547,7 @@ msgstr ""
 "volta para a tela do instalador."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4549,12 +4563,12 @@ msgstr ""
 "questão."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Opções Avançadas do Gerenciador de Inicialização"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4568,7 +4582,7 @@ msgstr ""
 "adicional."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4578,16 +4592,20 @@ msgstr ""
 "disponível."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4606,7 +4624,7 @@ msgstr ""
 "sistemas operacionais que você tem."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Não modifica o \"Boot Device\", a menos que realmente saber o que fazer."
@@ -5003,9 +5021,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -5018,3 +5037,28 @@ msgid ""
 msgstr ""
 "O próximo passo é a cópia de arquivos no disco rígido. Isso leva alguns "
 "minutos. No final, você recebe uma tela em branco por algum tempo, é normal."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>\t\t\t\t"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 0b21b461..e54f2c83 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2015-06-14 14:35+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -585,23 +585,23 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 #, fuzzy
 msgid "Booting the medium"
 msgstr "CD-uri doar pentru demarat"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -612,19 +612,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -634,28 +634,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -664,13 +664,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -678,28 +678,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -709,7 +709,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -717,41 +717,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -759,7 +759,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2474,32 +2474,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Apoi apăsați pe <guibutton>Înainte</guibutton> pentru a continua"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2507,11 +2507,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 #, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Informații suplimentare sînt disponibile pe <link ns4:href=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -4166,22 +4166,26 @@ msgstr "Adăugați sau modificați o intrare din meniul de demaraj"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4193,7 +4197,7 @@ msgstr ""
 "acel moment."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 #, fuzzy
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
@@ -4208,18 +4212,19 @@ msgstr ""
 "code>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4228,7 +4233,7 @@ msgstr ""
 "intrare implicită sînt acțiuni care nu comportă nici un risc."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4236,7 +4241,7 @@ msgstr ""
 "puteți redenumi în întregime."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4245,7 +4250,7 @@ msgstr ""
 "o alegere la pornire."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 #, fuzzy
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
@@ -4255,12 +4260,12 @@ msgstr ""
 "încercați să testați ceva dacă nu știți ce faceți."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 #, fuzzy
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
@@ -4275,7 +4280,7 @@ msgstr ""
 "code>."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4283,7 +4288,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
@@ -4299,17 +4304,20 @@ msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4318,7 +4326,7 @@ msgstr ""
 "aleși automatic de instalator, în acest caz îi puteți schimba aici."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4329,18 +4337,18 @@ msgstr ""
 "existent, ori să lăsați Mageia să creeze unul nou."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 #, fuzzy
 msgid "The Mageia graphical menus are nice :"
 msgstr "Meniurile grafice Mageia sînt frumoase :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Se utilizează un încărcător de sistem Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 #, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
@@ -4354,7 +4362,7 @@ msgstr ""
 "adauge în noul meniu de demaraj."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4363,7 +4371,7 @@ msgstr ""
 "de GRUB (învechit) și Lilo. "
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
@@ -4375,7 +4383,7 @@ msgstr ""
 "dacă este utilizat încărcătorul de sistem GRUB implicit."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4384,12 +4392,12 @@ msgstr ""
 "care este disponibil în pagina rezumat din cursul instalării."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Se utilizează încărcătorul de sistem existent"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4403,7 +4411,7 @@ msgstr ""
 "încărcătorului de sistem. "
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 #, fuzzy
 msgid ""
 "Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
@@ -4416,14 +4424,14 @@ msgstr ""
 "exemplu: sda7)."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Ca să fie clar: sda este un dispozitiv, iar sda7 este o partiție de pe acel "
 "dispozitiv."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4434,7 +4442,7 @@ msgstr ""
 "+Alt+F7 vă readuce în ecranul instalatorului."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4449,12 +4457,12 @@ msgstr ""
 "sistem Mageia. Consultați documentația sistemului de operare în chestiune."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Opțiunile avansate ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4467,7 +4475,7 @@ msgstr ""
 "guilabel>. Acest lucru vă ajută să mențineți ceva spațiu liber."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 #, fuzzy
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
@@ -4478,16 +4486,19 @@ msgstr ""
 "numai unul singur este disponibil."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4499,7 +4510,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4874,8 +4885,8 @@ msgstr ""
 #: en/unused.xml:25
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
@@ -4886,6 +4897,31 @@ msgid ""
 msgstr ""
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 1b5c7ba4..bc6cf1e7 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2015-06-14 14:53+0000\n"
 "Last-Translator: Valentin XliN Saikov <saikov.vb@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
@@ -606,23 +606,23 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 #, fuzzy
 msgid "Booting the medium"
 msgstr "Носители CD только для загрузки"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -633,19 +633,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -655,28 +655,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
+#: en/bootLive.xml:12
 #, fuzzy
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -685,13 +685,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -699,28 +699,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -730,7 +730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -738,41 +738,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -780,7 +780,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2534,32 +2534,32 @@ msgstr ""
 "чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2567,11 +2567,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 #, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Ещё больше информации доступно в <link ns4:href=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">вики Mageia</link>."
@@ -4258,22 +4258,26 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4284,7 +4288,7 @@ msgstr ""
 "emphasis>. В ответ будет показано окно редактирования."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 #, fuzzy
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
@@ -4300,18 +4304,19 @@ msgstr ""
 "изменения в <code>/boot/grub2/custom.cfg</code > вручную."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4320,7 +4325,7 @@ msgstr ""
 "относится изменение метки записи или обозначение дефолтной записи в списке."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4328,7 +4333,7 @@ msgstr ""
 "название записи."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4337,7 +4342,7 @@ msgstr ""
 "пользователем не будет сделано другого выбора во время показа меню загрузки."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 #, fuzzy
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
@@ -4348,12 +4353,12 @@ msgstr ""
 "неизвестно их назначение."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 #, fuzzy
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
@@ -4369,7 +4374,7 @@ msgstr ""
 "изменения в <code>/boot/grub2/custom.cfg</code > вручную."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4377,7 +4382,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
@@ -4393,17 +4398,20 @@ msgstr "Основные параметры загрузчика"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\" /> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4413,7 +4421,7 @@ msgstr ""
 "их с помощью этой страницы."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4424,18 +4432,18 @@ msgstr ""
 "к меню текущего загрузчика, или Mageia должна создать собственный загрузчик."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 #, fuzzy
 msgid "The Mageia graphical menus are nice :"
 msgstr "Графические меню Mageia выглядят великолепно. :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Использование загрузчика Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 #, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
@@ -4449,7 +4457,7 @@ msgstr ""
 "этих операционных систем в новое меню загрузки Mageia."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4458,7 +4466,7 @@ msgstr ""
 "дополнение к устаревшей версии GRUB и Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 #, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
@@ -4470,7 +4478,7 @@ msgstr ""
 "GRUB (устаревшей версии)."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4480,12 +4488,12 @@ msgstr ""
 "операционной системы."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Использование уже установленного загрузчика"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4498,7 +4506,7 @@ msgstr ""
 "сможете изменить место установки загрузчика."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 #, fuzzy
 msgid ""
 "Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
@@ -4510,12 +4518,12 @@ msgstr ""
 "шаге распределения диска на разделы, например «sda7»."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Если быть точным, sda - это устройство, а sda7 - раздел на устройстве."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4527,7 +4535,7 @@ msgstr ""
 "помощью нажатия комбинации клавиш Ctrl+Alt+F7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4543,12 +4551,12 @@ msgstr ""
 "другой операционной системы."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Дополнительные параметры загрузчика"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4561,7 +4569,7 @@ msgstr ""
 "при каждой перезагрузке</guilabel>. Это поможет сэкономить немного места."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 #, fuzzy
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
@@ -4572,16 +4580,19 @@ msgstr ""
 "списка), - здесь выбор будет однозначным"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4593,7 +4604,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4976,8 +4987,8 @@ msgstr ""
 #: en/unused.xml:25
 #, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
@@ -4988,6 +4999,31 @@ msgid ""
 msgstr ""
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/installer/sk.po b/docs/installer/sk.po
index 0df4f9c3..25e09b0b 100644
--- a/docs/installer/sk.po
+++ b/docs/installer/sk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-01-24 16:48+0000\n"
 "Last-Translator: Jajo Pajo\n"
 "Language-Team: Slovak (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -586,22 +586,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr "Na karte pokročilé nájdete viac možností pre nastavenie času."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Zaviesť Mageiu ako Živý systém"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Zavedenie z dátového nosiča"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Z disku"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -618,7 +618,7 @@ msgstr ""
 "zavedie."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -627,12 +627,12 @@ msgstr ""
 "alebo druhá z dvoch nižšie uvedených obrazoviek."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Z USB zariadenia"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -647,27 +647,28 @@ msgstr ""
 "ktorá vám ponúkne vybrať si periférium, z ktorého sa naštartuje počítač."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V zastaralom BIOS/CSM režime"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Prvá obrazovka počas spúšťania v BIOSovom režime"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "V prostrednej ponuke, máte voľbu medzi tromi akciami:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -680,14 +681,14 @@ msgstr ""
 "inštalácií na pevný disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 "Nainštalovať Mageiu: Táto voľba priamo nainštaluje Mageiu na pevný disk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -698,30 +699,30 @@ msgstr ""
 "pripojené. (nepracuje sa s Mageiou 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "V spodnej ponuke sú Možnosti Zavedenia systému:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Pomoc. Vysvetľuje možnosti \"splash\", \"apm\", \"acpi\" a \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Jazyk. Vyberte si pre zobrazenie jazyka obrazoviek."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Rozlíšenie obrazovky. Voľba medzi textom, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -735,7 +736,7 @@ msgstr ""
 "možnosti si vyberte jeden z inštalačných zdrojov dostupných na serveri."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -746,7 +747,7 @@ msgstr ""
 "inštalácie."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -755,26 +756,27 @@ msgstr ""
 "hardvéru a ovládačom, ktoré sa použijú."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "V UEFI režime"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Prvá obrazovka počas štartu na UEFI systémoch z disku"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -783,7 +785,7 @@ msgstr ""
 "inštaláciu (druhá voľba)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -794,7 +796,7 @@ msgstr ""
 "ich na výber."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2520,31 +2522,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Potom stlačte <guibutton>Ďalej</guibutton> pre pokračovanie"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Prihlasovacia obrazovka"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM prihlasovacia obrazovka"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Nakoniec sa dostanete ku prihlasovacej obrazovke"
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2556,10 +2559,11 @@ msgstr ""
 "Mageie."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Ďalšiu časť našej dokumentácie môžete nájsť na <link linkend=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -4243,22 +4247,26 @@ msgstr "Pridanie alebo úprava položiek Ponuky na zavedenie systému"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "So systémom BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4269,7 +4277,7 @@ msgstr ""
 "zavádzača</emphasis> a upravovaním obrazovky, ktorá sa objaví nad ňou."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4282,18 +4290,19 @@ msgstr ""
 "<code>grub-customizer</code>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4302,13 +4311,13 @@ msgstr ""
 "nadpisu položky a zaškrtnutie políčka, aby sa položka stala predvolenou."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr "Môžete pridať správne číslo verzie položky, alebo ju celú premenovať."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4317,7 +4326,7 @@ msgstr ""
 "štartovania systému."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4326,12 +4335,12 @@ msgstr ""
 "prosím nič bez poznania toho, čo robíte."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "So systémom UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4345,7 +4354,7 @@ msgstr ""
 "vo vysúvacom zozname."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4356,7 +4365,7 @@ msgstr ""
 "zavádzač systémov."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4371,17 +4380,22 @@ msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4390,7 +4404,7 @@ msgstr ""
 "vybraných inštalátorom, môžete ich zmeniť tu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4401,17 +4415,17 @@ msgstr ""
 "alebo dovolíte Mageii vytvoriť nový zavádzač."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Grafické ponuky Mageie sú pekné:"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Použitie zavádzača Mageie"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4424,7 +4438,7 @@ msgstr ""
 "novej štartovacej ponuky Mageie."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4433,7 +4447,7 @@ msgstr ""
 "obstarožnému GRUBu a Lilu."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4444,7 +4458,7 @@ msgstr ""
 "predvolený zavádzač GRUB."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4453,12 +4467,12 @@ msgstr ""
 "súhrnnej stránke počas inštalácie."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Použitie už existujúceho zavádzača"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4471,7 +4485,7 @@ msgstr ""
 "inštalačné umiestnenie zavádzača."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4482,14 +4496,14 @@ msgstr ""
 "skoršie počas fázy delenia disku, ako je napr. sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Pre ujasnenie, sda je zariadenie, sda7 je partícia alebo iným slovom "
 "povedané oddiel na onom zariadení."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4500,7 +4514,7 @@ msgstr ""
 "partícia. Ctrl+Alt+F7 vás dostane naspäť na obrazovku inštalátora."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4515,12 +4529,12 @@ msgstr ""
 "systém."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Pokročilé parametre zavádzača"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4534,7 +4548,7 @@ msgstr ""
 "voľného miesta."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4543,16 +4557,20 @@ msgstr ""
 "nemôžete zvoliť zavádzač systému, keďže je dostupný len Grub2-efi."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4571,7 +4589,7 @@ msgstr ""
 "ktoré máte v počítači."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Neupravujte \"Zavádzacie Zariadenie\" pokiaľ naozaj neviete, čo robíte."
@@ -4966,9 +4984,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4981,3 +5000,28 @@ msgid ""
 msgstr ""
 "Ďalším krokom je kopírovanie súborov na pevný disk. Toto zaberie niekoľko "
 "minút. Na konci dostanete na určitý čas prázdnu obrazovku, to je normálne."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 66ed01e2..7e8c4c85 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-07-15 07:32+0000\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
@@ -484,22 +484,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Zaženi Magejo kot živ sistem"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Zagon medija"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Z diska"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -510,19 +510,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Z naprave USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -532,27 +532,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "V načinu BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Prvi zaslon med zagonom v načinu BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -561,13 +562,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -575,29 +576,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "V spodnjem meniju so na voljo zagonske možnosti:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 - pomoč. Razlaga možnosti »splash«, »apm«, »acpi« in »Ide«"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - jezik. Izbor jezika za prikaz na zaslonu."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - ločljivost zaslona. Na voljo je izbor: tekst, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -607,7 +608,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -615,40 +616,41 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "V načinu UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Prvi zaslon med zagonom sistema z diska v načinu UEFI "
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -656,7 +658,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2076,31 +2078,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2108,10 +2111,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3509,22 +3512,26 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3532,7 +3539,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3541,50 +3548,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3593,7 +3601,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3601,7 +3609,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -3616,24 +3624,29 @@ msgstr "Glavne možnosti zagonskega nalagalnika"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -3641,17 +3654,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -3660,14 +3673,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -3675,19 +3688,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -3696,7 +3709,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -3704,12 +3717,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -3717,7 +3730,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -3727,12 +3740,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Napredne možnosti zagonskega nalagalnika"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3741,23 +3754,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -3769,7 +3786,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4097,9 +4114,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4110,3 +4128,28 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index c79614f2..24c71bf6 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-05-19 09:07+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -588,22 +588,22 @@ msgstr ""
 "Në tab avancuar, ju do të gjeni më shumë opsione për parametrat e orës."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Ndez Mageia si Sistem Live"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Nga disku"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -614,19 +614,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Nga një pajisje USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -636,27 +636,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Ekrani fillestarë gjatë ndezjes në mënyrë të BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "Nl menynë e mesëm, ju kenë zgjedhjen e tre veprimeve:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -665,13 +666,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -679,30 +680,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 - Ndihmë. Shpjegon mundësitë \"splash\", \"apm\", \"acpi\" dhe \"Ide\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Gjuha. Përzgjedh gjuhën të shfaqur në ekran."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Rezolucioni ekranit. Zgjidh ndërmjet text, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -712,7 +713,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -720,33 +721,34 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "Në mënyrë UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Ekrani fillestarë gjatë ndezjes në sistem UEFI nga disku"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -755,7 +757,7 @@ msgstr ""
 "(zgjedhja e parë), ose për të vazhduar me instalimin (zgjedhje e dytë)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -763,7 +765,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2420,31 +2422,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Pastaj shtyp <guibutton>Tjetër</guibutton> për të vazhduar"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2452,10 +2455,10 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3882,19 +3885,26 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3902,7 +3912,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3911,50 +3921,51 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3963,7 +3974,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -3971,7 +3982,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -3984,21 +3995,29 @@ msgstr "Opsionet kryesore të programit Bootloader"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4006,17 +4025,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4025,14 +4044,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4040,19 +4059,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4061,7 +4080,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4069,12 +4088,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4082,7 +4101,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4092,12 +4111,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4106,21 +4125,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
 msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4132,7 +4156,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 
@@ -4461,10 +4485,11 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index bd3708a6..c24a5205 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-05-24 15:42+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -583,22 +583,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr "På fliken avancerat hittar du fler inställningar för klockan."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Starta Mageia som ett Live-system"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Startar upp mediat"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Från en skiva"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -615,7 +615,7 @@ msgstr ""
 "välja startmedia."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -624,12 +624,12 @@ msgstr ""
 "av följande två skärmar nedan."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Från en USB-enhet"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -644,27 +644,28 @@ msgstr ""
 "gör att du kan välja startmedia."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "I BIOS/CSM/Legacy-läge"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Den första skärmen när du startar i BIOS-läge"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "I den mittersta menyn så kan du välja mellan tre handlingar:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -677,7 +678,7 @@ msgstr ""
 "fortsätta och installera på hårddisken."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -685,7 +686,7 @@ msgstr ""
 "hårddisk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -696,28 +697,28 @@ msgstr ""
 "anslutet. (fungerar inte med Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "I menyn längst ner finns startalternativen:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 - Hjälp. Förklara valen \"splash\", \"apm\", \"acpi\" och \"idle\""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Språk. Välj skärmens visningsspråk."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr "F3 - Skärmupplösning. Välj mellan text, 640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -731,7 +732,7 @@ msgstr ""
 "så kan du välja installationskällor på servern med det här alternativet."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -742,7 +743,7 @@ msgstr ""
 "sätts in under installationsprocessen."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -751,26 +752,27 @@ msgstr ""
 "hårdvara och vilka drivrutiner som ska användas."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "I UEFI-läge"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Första skärmen när du startar ett UEFI-system från disk"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -779,7 +781,7 @@ msgstr ""
 "bearbeta installationen (andra alternativet)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -789,7 +791,7 @@ msgstr ""
 "men har \"USB\" på slutet. Du måste välja dem."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2509,31 +2511,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Tryck sedan på <guibutton>Nästa</guibutton> för att fortsätta"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Inloggningsskärm"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Inoggningsskärm för KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Slutligen så kommer du till inloggningsskärmen."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2545,10 +2548,11 @@ msgstr ""
 "av Mageia."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Du hittar mer dokumentation i <link linkend=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">Mageias Wiki</link>."
@@ -4220,22 +4224,26 @@ msgstr "Lägg till eller ändra en post i bootmenyn"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Med ett BIOS-system"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4246,7 +4254,7 @@ msgstr ""
 "emphasis> och ändra i fönstret som dyker upp."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4259,18 +4267,19 @@ msgstr ""
 "använda <code>grub-customizer</code>."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4279,7 +4288,7 @@ msgstr ""
 "markera kryssrutan för att ange den som ska vara standard."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4287,7 +4296,7 @@ msgstr ""
 "helt."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4296,7 +4305,7 @@ msgstr ""
 "startar datorn."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4306,12 +4315,12 @@ msgstr ""
 "vad du gör."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Med ett UEFI-system"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4325,7 +4334,7 @@ msgstr ""
 "rullgardinsmenyn."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4336,7 +4345,7 @@ msgstr ""
 "starthanterare."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4351,17 +4360,22 @@ msgstr "Huvudalternativ för startshanteraren"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4370,7 +4384,7 @@ msgstr ""
 "automatiskt valda av installationen så kan du ändra dessa här."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4381,17 +4395,17 @@ msgstr ""
 "tillåta Mageia att skapa en ny."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Mageia's grafiska menyer är fina :"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Använder en startshanterare från Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4404,7 +4418,7 @@ msgstr ""
 "nya startmeny."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4413,7 +4427,7 @@ msgstr ""
 "GRUB legacy och Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4424,7 +4438,7 @@ msgstr ""
 "används är GRUB."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4433,12 +4447,12 @@ msgstr ""
 "tillgänglig på översiktssidan under installation."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Använder en befintlig startshanterare"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4451,7 +4465,7 @@ msgstr ""
 "ändra var du vill installera starthanteraren."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4462,13 +4476,13 @@ msgstr ""
 "installationen tidigare, t. ex. sda7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "För att klargöra, sda är en enhet, sda7 är en partition på den enheten."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4479,7 +4493,7 @@ msgstr ""
 "tar dig tillbaka till installationen."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4493,12 +4507,12 @@ msgstr ""
 "till det automatiskt. Se dokumentationen för operativsystemet i fråga."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Avancerat alternativ för starthanteraren"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4511,7 +4525,7 @@ msgstr ""
 "guilabel>. Det hjälper till att upprätthålla en viss mängd ledigt utrymme."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4520,16 +4534,20 @@ msgstr ""
 "kan välja starthanterare, det är bara Grub2-efi som är tillgänglig."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4549,7 +4567,7 @@ msgstr ""
 "operativsystem du har."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr "Ändra inte din \"startenhet\" om du inte verkligen vet vad du gör."
 
@@ -4938,9 +4956,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4953,3 +4972,28 @@ msgid ""
 msgstr ""
 "I nästa steg kopieras filerna till hårddisken. Det kan ta lite tid och du "
 "kommer att få en blank skärm i slutet vilket är normalt."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index a0be7103..f66b504d 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-04-03 22:04+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -587,22 +587,22 @@ msgstr ""
 "bulabilirsiniz."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Mageia' yı ÇalışanCD Sistemi olarak başlatmak"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Kurulum ortamını başlatmak"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "Bir diskten"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -619,7 +619,7 @@ msgstr ""
 "başlatılacağını seçmek için önerilen bir tuşa basmanız gerekebilir."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -628,12 +628,12 @@ msgstr ""
 "aşağıdaki tek veya diğer iki ekranla karşılaşırsınız."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "Bir USB aygıttan"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -648,27 +648,28 @@ msgstr ""
 "gerekebilir."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "BIOS/CSM/Legacy kipinde"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "BIOS kipinde önyükleme yapılırken ilk ekran"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "Orta menüde, üç eylem arasında seçim yapabilirsiniz:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -681,13 +682,13 @@ msgstr ""
 "sabit diske kurulum yapmaya başlayabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr "Mageia'yı Kur: Bu seçenek Mageia'yı doğrudan sabit diske kuracaktır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -698,31 +699,31 @@ msgstr ""
 "izin verir. (Mageia 5 ile çalışmamaktadır)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "Alt menüde Önyükleme Seçenekleri bulunmaktadır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 -Yardım. \"splash\", \"apm\", \"acpi\" ve \"Ide\" seçenekleini açıklar"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - Dil. Ekranlarda görüntülenecek dili seçin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Ekran çözünürlüğü. Metin, 640x400, 800x600,1024x728 seçeneklerinden "
 "birini seçin"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -737,7 +738,7 @@ msgstr ""
 "seçin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -748,7 +749,7 @@ msgstr ""
 "takılmasını gerektirebilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -757,26 +758,27 @@ msgstr ""
 "sürücülere bağlı olarak çeşitli seçenekleri belirtebilirsiniz."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "UEFI kipinde"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "UEFI sistem diskten başlatılırken ilk ekran"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -785,7 +787,7 @@ msgstr ""
 "başlama (ikinci seçenek) seçeneklerini kullanabilirsiniz."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -796,7 +798,7 @@ msgstr ""
 "seçim yapmalısınız."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2523,31 +2525,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "Sonra devam etmek için <guibutton>İleri</guibutton> düğmesine basın"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Giriş Ekranı"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM giriş ekranı"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Son olarak, giriş ekranına geleceksiniz."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2558,10 +2561,11 @@ msgstr ""
 "bulacaksınız. Artık, Mageia kurulumunuza başlayabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Belgelendirmemizin diğer kısımlarına <link linkend=\"https://wiki.mageia.org/"
 "en/Category:Documentation\">Mageia Wiki</link> sayfasında bulabilirsiniz."
@@ -4141,10 +4145,10 @@ msgid ""
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=\""
-"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
@@ -4244,22 +4248,26 @@ msgstr "Önyükleme Menü Girdisi Ekleme veya Değiştirme"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Bir Bios sistem ile"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4270,7 +4278,7 @@ msgstr ""
 "değiştirebilirsiniz."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4283,18 +4291,19 @@ msgstr ""
 "code> kullanmanız gerekiyor."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4303,7 +4312,7 @@ msgstr ""
 "ve girdiyi yanındaki kutucuğu işaretleyerek öntanımlı olarak belirlemektir."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4311,7 +4320,7 @@ msgstr ""
 "adlandırabilirsiniz."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4320,7 +4329,7 @@ msgstr ""
 "önyükleme yapacağı girdidir."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4330,12 +4339,12 @@ msgstr ""
 "kalkmayın."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Bir UEFI sistem ile"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4343,13 +4352,13 @@ msgid ""
 "do here, is to choose the default entry in the drop down list."
 msgstr ""
 "Bu durumda Grub2-efi kullanmaktasınız ve şu aşamada girdileri düzenlemek "
-"için bu aracı kullanamazsınız. Bunu yapabilmek için "
-"<code>/boot/grub2/custom.cfg</code> dosyasını elle düzenlemeli veya <code"
-">grub-customizer</code> aracını kullanmalısınız. Burada yapabileceğiniz tek "
-"şey açılır menüden öntanımlı girdiyi seçmektir."
+"için bu aracı kullanamazsınız. Bunu yapabilmek için <code>/boot/grub2/custom."
+"cfg</code> dosyasını elle düzenlemeli veya <code>grub-customizer</code> "
+"aracını kullanmalısınız. Burada yapabileceğiniz tek şey açılır menüden "
+"öntanımlı girdiyi seçmektir."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4360,13 +4369,13 @@ msgstr ""
 "başka açılır menü görüntülenir."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:7
@@ -4375,17 +4384,22 @@ msgstr "Önyükleyici ana seçenekleri"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4394,7 +4408,7 @@ msgstr ""
 "ayarları tercih ediyorsanız burada değiştirebilirsiniz."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4405,17 +4419,17 @@ msgstr ""
 "önyükleyici oluşturmasına izin vermek arasında tercih yapmalısınız."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Mageia grafik menüleri güzeldir :"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Bir Mageia önyükleyicisi kullanmak"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4428,7 +4442,7 @@ msgstr ""
 "dener."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4437,7 +4451,7 @@ msgstr ""
 "olarak sunmaktadır."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4448,7 +4462,7 @@ msgstr ""
 "algılanmayacaklardır."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4457,12 +4471,12 @@ msgstr ""
 "GRUB2 önyükleyiciyi kullanmak olacaktır."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Mevcut bir önyükleyiciyi kullanmak"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4474,7 +4488,7 @@ msgstr ""
 "Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine basmalısınız."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4485,14 +4499,14 @@ msgstr ""
 "seçmelisiniz."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 "Açık olmak gerekirse, sda bir aygıt ve sda7 ise o aygıt üzerindeki bir "
 "bölümdür."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4503,7 +4517,7 @@ msgstr ""
 "Ctrl+Alt+F7 sizi kurulum ekranına döndürür."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4518,12 +4532,12 @@ msgstr ""
 "bakın."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Önyükleyici gelişmiş seçenekleri"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4536,7 +4550,7 @@ msgstr ""
 "biraz boş alan kazanmanız mümkün olur."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4545,16 +4559,20 @@ msgstr ""
 "mevcut olduğundan önyükleyici seçemezsiniz."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4573,7 +4591,7 @@ msgstr ""
 "işletim sistemi kurulu olursa olsun biri yeterlidir."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Ne yaptığınızı gerçekten bilmediğiniz sürece \"Önyükleme Aygıtı\"nı "
@@ -4724,10 +4742,10 @@ msgid ""
 "imageobject>"
 msgstr ""
 "<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
-"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> <"
-"imageobject condition='classical'> <imagedata fileref=\""
-"dx2-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> "
-"</imageobject>"
+"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
+"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
@@ -4759,7 +4777,8 @@ msgstr "ÇalışanCD kipi"
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4768,8 +4787,8 @@ msgid ""
 "\"<link linkend=\"doPartitionDisks\">Partitioning</link> step\""
 msgstr ""
 "\"Mageia Sistemini Başlat\" seçerseniz bu ekran ile karşılaşırsınız. Aksi "
-"takdirde, \"<link linkend=\"doPartitionDisks\">Bölümlendirme</link> adımı\""
-"na geçmiş olursunuz."
+"takdirde, \"<link linkend=\"doPartitionDisks\">Bölümlendirme</link> adımı"
+"\"na geçmiş olursunuz."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/testing.xml:28
@@ -4844,8 +4863,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4857,8 +4876,8 @@ msgid ""
 msgstr ""
 "Mageia ÇalışanCD veya ÇalışanDVD ile sabit diske veya katı hal diskine "
 "kurulumu başlatmak için basitçe \"Sabit Diske Kur\" simgesine tıklayın. Bu "
-"ekrana ulaşacak ve sonra doğrudan kurulum için \"<link linkend=\""
-"doPartitionDisks\">Bölümlendirme</link>\" aşamasına geçeceksiniz."
+"ekrana ulaşacak ve sonra doğrudan kurulum için \"<link linkend="
+"\"doPartitionDisks\">Bölümlendirme</link>\" aşamasına geçeceksiniz."
 
 #. type: Content of: <section><info><title>
 #: en/uninstall-Mageia.xml:3
@@ -4968,9 +4987,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4984,3 +5004,28 @@ msgstr ""
 "Bir sonraki adım, dosyaların sabit diske kopyalanmasıdır. Bu işlem biraz "
 "zaman alabilir. Sonunda, kısa süreliğine boş bir ekran ile "
 "karşılaşabilirsiniz fakat bu durum gayet olağandır."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 795049c0..151e45b9 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-02-10 16:36+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -601,22 +601,22 @@ msgstr ""
 "налаштування годинника."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Завантаження Mageia як портативної системи"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Завантаження системи з носія"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "З диска"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -635,7 +635,7 @@ msgstr ""
 "завантаження системи на комп’ютері."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -645,12 +645,12 @@ msgstr ""
 "на екрані."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "З пристрою USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -666,27 +666,28 @@ msgstr ""
 "вибрати периферійний пристрій, з якого завантажуватиметься комп’ютер."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "У застарілому режимі BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Перший екран завантаження у режимі BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "За допомогою середнього меню ви можете вибрати одну з трьох дій:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -700,7 +701,7 @@ msgstr ""
 "або просто ознайомитися із нею."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -708,7 +709,7 @@ msgstr ""
 "встановлення Mageia на жорсткий диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -720,31 +721,31 @@ msgstr ""
 "працює у Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 "За допомогою нижнього меню можна отримати доступ до параметрів завантаження:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 — Довідка. Опис параметрі «splash», «apm», «acpi» та «Ide»"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 — Мова. Вибір мови інтерфейсу."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 — Роздільна здатність. Тут можна вибрати один із таких варіантів: text, "
 "640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -759,7 +760,7 @@ msgstr ""
 "цього пункту можна вибрати одне із джерел пакунків на сервері."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -770,7 +771,7 @@ msgstr ""
 "наказати їй попросити його вставити під час встановлення."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -779,26 +780,27 @@ msgstr ""
 "відповідні до апаратної частини, і драйвери, якими слід скористатися."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "У режимі UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Перший екран під час завантаження системи UEFI з диска"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -808,7 +810,7 @@ msgstr ""
 "варіант)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -819,7 +821,7 @@ msgstr ""
 "один із цих рядків."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2599,31 +2601,32 @@ msgstr ""
 "продовжити роботу з програмою."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Вікно вітання"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Вікно вітання KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Нарешті, вам буде показано вікно вітання."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2635,10 +2638,11 @@ msgstr ""
 "користуватися встановленою Mageia, як вам заманеться."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Іншу частину документації можна знайти у <link linkend=\"https://wiki.mageia."
 "org/en/Category:Documentation\">вікі Mageia</link>."
@@ -4362,22 +4366,26 @@ msgstr "Додавання пункту меню завантаження та �
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Із системою BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4388,7 +4396,7 @@ msgstr ""
 "відповідь буде показано вікно редагування."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4403,18 +4411,19 @@ msgstr ""
 "вручну."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4423,7 +4432,7 @@ msgstr ""
 "мітки запису або позначення типового запису у списку."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4431,7 +4440,7 @@ msgstr ""
 "запису."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4440,7 +4449,7 @@ msgstr ""
 "користувачем не буде зроблено іншого вибору під час показу меню завантаження."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4450,12 +4459,12 @@ msgstr ""
 "достеменно невідоме їхнє призначення."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Із системою UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4469,7 +4478,7 @@ msgstr ""
 "цьому кроці, вибрати типовий запис зі спадного списку."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4480,7 +4489,7 @@ msgstr ""
 "завантажувача системи."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4495,17 +4504,22 @@ msgstr "Основні параметри завантажувача"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4515,7 +4529,7 @@ msgstr ""
 "за допомогою цієї сторінки."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4526,17 +4540,17 @@ msgstr ""
 "до меню поточного завантажувача, чи Mageia має створити власний завантажувач."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Графічні меню Mageia виглядає чудово. :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Користування завантажувачем Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4549,7 +4563,7 @@ msgstr ""
 "цих операційних систем до нового меню завантаження Mageia."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4558,7 +4572,7 @@ msgstr ""
 "до застарілої версії GRUB та Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4569,7 +4583,7 @@ msgstr ""
 "GRUB (застарілої версії)."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4579,12 +4593,12 @@ msgstr ""
 "«Резюме» під час встановлення операційної системи."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Користування вже встановленим завантажувачем"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4597,7 +4611,7 @@ msgstr ""
 "ви зможете змінити місце встановлення завантажувача."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4608,12 +4622,12 @@ msgstr ""
 "кроку розподілу диска на розділи, наприклад «sda7»."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Якщо бути точним, sda — це пристрій, а sda7 — розділ на пристрої."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4625,7 +4639,7 @@ msgstr ""
 "встановлення можна за допомогою натискання комбінації клавіш Ctrl+Alt+F7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4641,12 +4655,12 @@ msgstr ""
 "до іншої операційної системи."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Додаткові параметри завантажувача"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4659,7 +4673,7 @@ msgstr ""
 "кожному перезавантаженні</guilabel>. Це допоможе зекономити трохи місця."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4669,16 +4683,20 @@ msgstr ""
 "буде лише grub2-efi."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4698,7 +4716,7 @@ msgstr ""
 "кількості встановлених вами операційних систем."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Не змінюйте значення параметри «Пристрій завантаження», якщо у цьому немає "
@@ -5107,9 +5125,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -5125,6 +5144,31 @@ msgstr ""
 "бачитимете порожній екран. Це нормально."
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index 3585297a..934fa0d7 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-07-12 12:36+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -541,22 +541,22 @@ msgid "In advanced tab, you will find more options about clock settings."
 msgstr "在高级选项卡中，你可以找到更多有关时钟设置的选项。"
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "引导 Mageia Live 系统"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "引导媒体"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "自磁盘"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "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 "
@@ -570,19 +570,19 @@ msgstr ""
 "者在电脑启动时按下特定按键来选择引导设备。"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
 msgstr "根据你所使用的硬件以及配置的不同，接下来还有一些安装选项需要设置。"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "自 USB 设备"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "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 "
@@ -595,27 +595,28 @@ msgstr ""
 "修改 BIOS 配置，或在电脑启动时按下特定按键来选择引导设备。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "在 BIOS/CSM/Legacy 模式下"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "在 BIOS 模式下引导时的第一个画面"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "中间的菜单提供了三个可选操作："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "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 "
@@ -626,13 +627,13 @@ msgstr ""
 "任何数据，所以系统可能运行较慢。引导完成后，即可将系统安装到硬盘。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr "Install Mageia：将 Mageia 直接安装到硬盘。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "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 "
@@ -642,28 +643,28 @@ msgstr ""
 "5）。"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr "底部菜单中提供了引导选项："
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 - 帮助。说明”splash“、”apm“、”acpi“、”ide“等选项。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 - 语言。选择用于显示的语言。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr "F3 -屏幕分辨率。选择 640x400、800x600、1024x728 或纯文本模式。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -676,7 +677,7 @@ msgstr ""
 "服务器上可用的安装源。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "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 "
@@ -686,33 +687,34 @@ msgstr ""
 "插入。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
 msgstr "F6 - 内核选项。用于指定与硬件和驱动相关的内核参数。"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "在 UEFI 模式下"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "在 UEFI 模式下引导时的第一个画面"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -721,7 +723,7 @@ msgstr ""
 "项）。"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "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 "
@@ -729,7 +731,7 @@ msgid ""
 msgstr "若从 U 盘引导，除了以”uSB“结尾的行以外，还会有额外的两行供选择。"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2306,31 +2308,32 @@ msgid "Then press <guibutton>Next</guibutton> to continue"
 msgstr "然后按<guibutton>下一步</guibutton>继续"
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "登录界面"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "KDM 登录界面"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "最后，您将会看到登录界面。"
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "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 "
@@ -2340,10 +2343,11 @@ msgstr ""
 "而异）。您现在即可使用 Mageia 系统。"
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "可以在 <link linkend=\"https://wiki.mageia.org/en/Category:Documentation"
 "\">Mageia wiki</link> 中找到有关系统使用的方法。"
@@ -3675,8 +3679,8 @@ msgid ""
 "emphasis> do this later in the install."
 msgstr ""
 "若您忘记选择某一附加语言，您可以回到“安装或升级”界面，然后按下来 "
-"<guilabel>Alt Ctrl Home</guilabel> 并进行选择。请<emphasis>不要</emphasis>在安"
-"装后再进行添加。"
+"<guilabel>Alt Ctrl Home</guilabel> 并进行选择。请<emphasis>不要</emphasis>在"
+"安装后再进行添加。"
 
 #. type: Content of: <section><info><title>
 #: en/selectKeyboardLive.xml:3
@@ -3902,22 +3906,26 @@ msgstr "添加或修改引导菜单项"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "使用 BIOS 系统"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -3927,7 +3935,7 @@ msgstr ""
 "面按下相应键，并在弹出的编辑界面中进行操作。"
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -3939,50 +3947,51 @@ msgstr ""
 "使用 <code>grub-customizer</code> 来编辑。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
 msgstr "部分操作，例如改变引导项标题，或设置默认选项，是没有风险的。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr "您可以为某一项添加版本号，或者完全删除它。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
 msgstr "若您在引导时未进行选择，则会进入默认引导项对应的系统。"
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
 msgstr "编辑其他内容可能导致系统无法引导。请不要在不了解的情况下进行修改。"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "使用 UEFI 系统"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -3994,7 +4003,7 @@ msgstr ""
 "customizer</code> 来进行编辑。此处您只能选择默认引导项。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4004,7 +4013,7 @@ msgstr ""
 "用它来选择 GRUB2 引导器的屏幕分辨率。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4019,24 +4028,29 @@ msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
 msgstr "若您希望修改安装程序默认选择的引导器设置，可以在这里进行更改。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4046,17 +4060,17 @@ msgstr ""
 "器，或让 Mageia 创建一个新的起动器。"
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Mageia 的图形化菜单："
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "使用 Mageia 提供的引导器"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "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 "
@@ -4067,14 +4081,14 @@ msgstr ""
 "中。如果您已经安装了其他系统，Mageia 会尝试将其添加到新的引导菜单中。"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
 msgstr "除了 GRUB 传统版和 Lilo，Mageia 目前也提供 GRUB2 作为可选的引导器，"
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "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 "
@@ -4084,7 +4098,7 @@ msgstr ""
 "统。"
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4092,12 +4106,12 @@ msgstr ""
 "最好的解决方法是使用 GRUB 2 引导器，可以在安装过程中的摘要页面中选择安装。"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "使用现存的引导器"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4108,7 +4122,7 @@ msgstr ""
 "<guibutton>配置</guibutton> 按钮，并改变引导器的安装位置。"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "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 "
@@ -4118,12 +4132,12 @@ msgstr ""
 "区操作中设置）作为安装对象"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "要清楚，sda 代表一个设备（磁盘），sda7 代表设备上的分区。"
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4134,7 +4148,7 @@ msgstr ""
 "面。"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4147,12 +4161,12 @@ msgstr ""
 "以便进一步操作。"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "引导器高级选项"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4164,7 +4178,7 @@ msgstr ""
 "guilabel>。这有助于维持一定的空闲空间。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4172,16 +4186,20 @@ msgstr ""
 "对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4198,7 +4216,7 @@ msgstr ""
 "求。"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr "若您不确定如何操作，请不要修改“引导设备”。"
 
@@ -4564,9 +4582,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -4579,3 +4598,28 @@ msgid ""
 msgstr ""
 "下一步是复制文件到硬盘。这需要花费几分钟的时间。之后，您的屏幕会变黑一段时"
 "间，这是正常现象。"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"