Update translations

23 files changed, 2370 insertions, 1837 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 00a9fac4..b6359ae2 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-04-25 12:38+0200\n"
 "Last-Translator: Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>\n"
 "Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -1113,21 +1113,22 @@ msgstr ""
 "automàticament. De nou, sigueu prudents en les vostres seleccions."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particionament personalitzat del disc amb DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1140,18 +1141,19 @@ msgstr ""
 "literal>. Si no, el sistema no arrencarà."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Ajusteu aquí l'estructura dels discs. Podeu eliminar o bé crear particions, "
 "canviar el sistema de fitxers d'una partició, o bé canviar-ne la mida o, "
 "fins i tot, veure'n el contingut abans de començar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1161,7 +1163,7 @@ msgstr ""
 "n'hi ha tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1170,7 +1172,7 @@ msgstr ""
 "particions del dispositiu d'emmagatzematge seleccionat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1180,15 +1182,36 @@ msgstr ""
 "muntatge, redimensioneu-la, o bé elimineu-la."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continueu fins que tot sigui del vostre grat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Cliqueu <guibutton>Fet</guibutton> en acabat."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1393,22 +1416,22 @@ msgstr ""
 "parell de megabytes."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instal·lació amb DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Febrer 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1423,7 +1446,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1434,7 +1457,7 @@ msgstr ""
 "licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1445,7 +1468,7 @@ msgstr ""
 "www.neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1455,13 +1478,13 @@ msgstr ""
 "millorar-lo, contacteu l'<link ns6:href=\"https://wiki.mageia.org/en/"
 "Documentation_team\">equip de documentació</link>."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1471,8 +1494,8 @@ msgstr ""
 "manual. Les imatges que veureu dependran del vostre maquinari i de les "
 "decisions que aneu prenent durant la instal·lació."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1656,11 +1679,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1852,8 +1870,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Amb la tecla F2 l'ajuda es tradueix a la llengua triada."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3541,14 +3559,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3559,7 +3577,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3568,7 +3586,7 @@ msgstr ""
 "entrada i marcar la casella per a fer-la predeterminada."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3576,7 +3594,7 @@ msgstr ""
 "completament."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3585,7 +3603,7 @@ msgstr ""
 "selecció mentre el sistema està arrencant."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3602,17 +3620,25 @@ msgstr "Opcions principals del menú d'arrencada"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3621,7 +3647,7 @@ msgstr ""
 "ha estat triada automàticament, la podeu canviar aquí."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3632,17 +3658,17 @@ msgstr ""
 "permetre a Mageia que en creï un de nou."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Els menús gràfics de Mageia són bonics :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Ús del carregador d'arrencada de Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3655,7 +3681,7 @@ msgstr ""
 "menú d'arrencada de Mageia."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3664,7 +3690,7 @@ msgstr ""
 "l'antic GRUB i Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3675,7 +3701,7 @@ msgstr ""
 "carregador d'arrencada predeterminat GRUB."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3684,12 +3710,12 @@ msgstr ""
 "està disponible a la pàgina de resum durant la instal·lació."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Ús d'un carregador d'arrencada existent"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3702,7 +3728,7 @@ msgstr ""
 "us permetrà canviar-ne la localització."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3713,13 +3739,13 @@ msgstr ""
 "prèvia de particionament, per exemple sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3730,7 +3756,7 @@ msgstr ""
 "pantalla d'instal·lació."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3745,12 +3771,12 @@ msgstr ""
 "del sistema operatiu corresponent."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Opció avançada del carregador d'arrencada"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 1d30e8ea..8074f0e0 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-04-17 20:04+0000\n"
 "Last-Translator: Luděk Janča <joelp@email.cz>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
@@ -991,21 +991,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Vlastní rozdělení disku pomocí DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1014,44 +1015,65 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1220,22 +1242,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalace pomocí DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Únor 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1250,7 +1272,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1258,7 +1280,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1266,28 +1288,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1449,11 +1471,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1634,8 +1651,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3083,14 +3100,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3098,27 +3115,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3133,24 +3150,32 @@ msgstr "Základní nastavení zaváděcího programu"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: 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><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3158,17 +3183,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3177,14 +3202,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: 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><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3192,19 +3217,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 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><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3213,7 +3238,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3221,12 +3246,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3234,7 +3259,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3244,12 +3269,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index 52c1f3fd..6219a279 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-10 19:22+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/projects/p/mageia/language/"
@@ -1155,21 +1155,22 @@ msgstr ""
 "Nochmal: es ist besser eher zu niedrige Einstellungen zu wählen."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Benutzerdefinierte Laufwerkspartitionierung mit DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-diskdrake.png\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1183,11 +1184,12 @@ msgstr ""
 "emphasis> gesetzt werden, da sonst das System nicht gebootet werden kann."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Hier können Sie das Layout Ihres Laufwerks (Ihrer Laufwerke) bestimmen. Sie "
 "können Partitionen löschen oder erstellen, das Dateisystem einer Partition "
@@ -1195,7 +1197,7 @@ msgstr ""
 "Sie daran Änderungen vornehmen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1205,7 +1207,7 @@ msgstr ""
 "und <emphasis>sdc</emphasis>, wenn drei Laufwerke gefunden wurden."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1214,7 +1216,7 @@ msgstr ""
 "gewählten Laufwerks zu löschen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1225,17 +1227,38 @@ msgstr ""
 "ändern Sie die Größe oder löschen Sie die Partition."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Wiederholen Sie diesen Vorgang für alle Laufwerke, bis alle Einstellungen "
 "Ihren Wünschen entsprechen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Ist alles bereit, so klicken Sie auf <guibutton>Fertig</guibutton>."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1440,22 +1463,22 @@ msgstr ""
 "an Megabytes erstellt werden"
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installation mit Hilfe von DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Februar 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1470,7 +1493,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1481,7 +1504,7 @@ msgstr ""
 "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1492,7 +1515,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1503,13 +1526,13 @@ msgstr ""
 "\">Documentation Team</link>, wenn Sie dazu beitragen möchten, diese "
 "Anleitung zu verbessern."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1519,8 +1542,8 @@ msgstr ""
 "sehen. Welche Fenster Sie sehen werden, hängt von Ihrer Hardware und den "
 "Entscheidungen, die Sie während der Installation treffen, ab."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1712,11 +1735,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1932,8 +1950,8 @@ msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Die Hilfe wird in der, mit der F2 Taste, ausgewählten Sprache angezeigt."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3679,11 +3697,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Falls Sie <code>Grub 2</code> als Bootloader ausgewählt haben, können Sie "
 "dieses Werkzeug nicht verwenden um die Einträge zu bearbeiten. Drücke "
@@ -3691,7 +3710,7 @@ msgstr ""
 "editieren oder <code>grub-customizer</code> verwenden."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3702,7 +3721,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3711,7 +3730,7 @@ msgstr ""
 "aktivieren das Kästchen, welches den Eintrag als Standard setzt."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3719,7 +3738,7 @@ msgstr ""
 "vollständig umbenennen."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3728,7 +3747,7 @@ msgstr ""
 "Standardeintrag vom System gestartet."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3745,17 +3764,25 @@ msgstr "Hauptoptionen des Bootloaders"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupBootloader.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"setupBootloader-im1\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3765,7 +3792,7 @@ msgstr ""
 "ändern."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3777,17 +3804,17 @@ msgstr ""
 "werden soll, einen neuen Bootloader zu erstellen."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Das grafische Menü von Mageia ist hübsch :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Verwenden des Mageia Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3799,7 +3826,7 @@ msgstr ""
 "installiert, versucht Mageia, diese in das neue Mageia-Startmenü einzufügen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3807,7 +3834,7 @@ msgstr ""
 "Mageia bietet jetzt neben GRUB legacy optional auch GRUB2 als Bootloader an."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3817,7 +3844,7 @@ msgstr ""
 "von GRUB legacy unterstützt und werden auch nicht von GRUB legacy erkannt."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3826,12 +3853,12 @@ msgstr ""
 "Zusammenfassungs-Seite empfohlen wird."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Verwenden eines bestehenden Bootloaders"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3845,7 +3872,7 @@ msgstr ""
 "Installationsort des Bootloaders zu ändern."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3856,14 +3883,14 @@ msgstr ""
 "Partitionierungsphase gewählt haben. z.B. sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3876,7 +3903,7 @@ msgstr ""
 "Installationsbildschirm zurück."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3892,12 +3919,12 @@ msgstr ""
 "offen sind."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Erweiterte Optionen für den Bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/el.po b/docs/installer/el.po
index 35cf148d..483e4c39 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-02-28 10:00+0100\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -1138,21 +1138,22 @@ msgstr ""
 "είστε συντηρητικοί στις επιλογές σας."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Προσαρμοσμένη κατάτμηση δίσκων με το DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1165,11 +1166,12 @@ msgstr ""
 "δεν θα είναι δυνατή η εκκίνηση του υπολογιστή σας."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Εδώ μπορείτε να ρυθμίσετε τη διάταξη των δίσκων σας. Μπορείτε να αφαιρέσετε "
 "ή να δημιουργήσετε κατατμήσεις, να αλλάξετε το σύστημα αρχείων μιας "
@@ -1177,7 +1179,7 @@ msgstr ""
 "περιεχόμενό της πριν να ξεκινήσετε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1187,7 +1189,7 @@ msgstr ""
 "τρία από αυτά."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1196,7 +1198,7 @@ msgstr ""
 "τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1206,15 +1208,36 @@ msgstr ""
 "προσάρτησης, αλλάξτε το μέγεθός της ή καθαρίστε την."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Συνεχίστε έως ότου ρυθμίσετε οτιδήποτε επιθυμείτε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Κάντε κλικ στο <guibutton>Έγινε</guibutton> όταν είστε έτοιμος-η."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1421,22 +1444,22 @@ msgstr ""
 "Mb."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Εγκατάσταση με το DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Φεβρουάριος 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1451,7 +1474,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1463,7 +1486,7 @@ msgstr ""
 "link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1474,7 +1497,7 @@ msgstr ""
 "<link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1485,13 +1508,13 @@ msgstr ""
 "επικοινωνήστε με την <link ns6:href=\"https://wiki.mageia.org/en/"
 "Documentation_team\">Ομάδα της τεκμηρίωσης</link>."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1501,8 +1524,8 @@ msgstr ""
 "εγχειρίδιο. Για το ποιες οθόνες θα βλέπετε, εξαρτάται από το υλικό σας και "
 "τις επιλογές που κάνετε κατά την εγκατάσταση."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1692,11 +1715,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1912,8 +1930,8 @@ msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Η Βοήθεια εμφανίζεται μεταφρασμένη στην επιλεγμένη γλώσσα με το πλήκτρο F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3708,11 +3726,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Αν έχετε επιλέξει <code>Grub 2</code> ως πρόγραμμα εκκίνησης, δεν μπορείτε "
 "να χρησιμοποιήσετε αυτό το εργαλείο για την επεξεργασία των καταχωρήσεων σε "
@@ -3721,7 +3740,7 @@ msgstr ""
 "<code>grub-customizer</code>."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3732,7 +3751,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3742,7 +3761,7 @@ msgstr ""
 "προκαθορισμένη."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3750,7 +3769,7 @@ msgstr ""
 "μετονομάσετε πλήρως."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3759,7 +3778,7 @@ msgstr ""
 "δεν επιλέξετε κάποια άλλη καταχώρηση στην εκκίνηση."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3777,17 +3796,25 @@ msgstr "Κύριες επιλογές του προγράμματος εκκίν
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3796,7 +3823,7 @@ msgstr ""
 "εκκίνησης, μπορείτε να τις αλλάξετε από εδώ."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3808,17 +3835,17 @@ msgstr ""
 "ένα νέο."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Το γραφικό μενού της Mageia είναι πολύ όμορφο :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Χρησιμοποιώντας το πρόγραμμα εκκίνησης της Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3831,7 +3858,7 @@ msgstr ""
 "εκκίνησης της Mageia."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3840,7 +3867,7 @@ msgstr ""
 "επιπρόσθετα του GRUB legacy και του Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3851,7 +3878,7 @@ msgstr ""
 "προκαθορισμένο GRUB."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3860,12 +3887,12 @@ msgstr ""
 "σελίδα σύνοψης στα βήματα της εγκατάστασης."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Χρήση ενός υπάρχοντος μενού εκκίνησης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3879,7 +3906,7 @@ msgstr ""
 "του προγράμματος εκκίνησης."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3890,12 +3917,12 @@ msgstr ""
 "τον διαμερισμό νωρίτερα π.χ. sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Δηλαδή, το sda είναι μια συσκευή, και το sda7 είναι μια κατάτμηση."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3906,7 +3933,7 @@ msgstr ""
 "Ctrl+Alt+F7 επιστρέφετε στην οθόνη εγκατάστασης."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3922,12 +3949,12 @@ msgstr ""
 "εν λόγω λειτουργικού συστήματος."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Προχωρημένη λειτουργία του προγράμματος εκκίνησης"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index 274763e7..6844d1a7 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+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/"
@@ -1061,21 +1061,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Agordi subdiskon per DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1088,18 +1089,19 @@ msgstr ""
 "ne startos."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Agordu via(j)n disko(j)n ĉi tie. Vi povas forigi aŭ krei subdiskojn, ŝanĝi "
 "la dosiersistemon de subdisko aŭ ŝanĝi ĝian grandon kaj eĉ vidi kio estas en "
 "ĝi antaŭ ol komenci."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1108,7 +1110,7 @@ msgstr ""
 "USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1117,7 +1119,7 @@ msgstr ""
 "elektita stor-aparato"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1126,15 +1128,36 @@ msgstr ""
 "elekti dosiersistemon kaj surmetingon, ŝanĝi ĝian grandon aŭ forigi ĝin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Daŭrigu ĝis kiam vi agordos ĉion laŭ via deziro."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1336,22 +1359,22 @@ msgstr ""
 "Also make sure all partitions are created with an even number of megabytes."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalado per DrakX-o"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr ""
 
@@ -1366,7 +1389,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1377,7 +1400,7 @@ msgstr ""
 "creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1388,7 +1411,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1398,13 +1421,13 @@ msgstr ""
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
 "link>, if you would like to help improve this manual."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1413,8 +1436,8 @@ msgstr ""
 "Neniu vidos ĉiujn ekranojn, kiujn vi vidas en ĉi helpo. Tio kiujn ekranojn "
 "vi vidos, dependas de via komputilo kaj viaj elektoj dum instalado."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1593,11 +1616,6 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1784,8 +1802,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3390,14 +3408,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
@@ -3409,27 +3427,27 @@ msgstr ""
 "\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3444,17 +3462,25 @@ msgstr "Lanĉilaj ĉefaj elektoj"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3463,7 +3489,7 @@ msgstr ""
 "la instalilo, vi povas ŝanĝi ĝin ĉi tie."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3474,17 +3500,17 @@ msgstr ""
 "Magejo krei novan."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "La grafika menuo de Magejo estas bela :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Uzi la lanĉilon de Magejo"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3496,7 +3522,7 @@ msgstr ""
 "ilin al via nova Mageja lanĉilo."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3505,7 +3531,7 @@ msgstr ""
 "legacy and Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3516,7 +3542,7 @@ msgstr ""
 "used."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3525,12 +3551,12 @@ msgstr ""
 "the Summary page during installation."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Uzi ekzistantan lanĉilon"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3542,7 +3568,7 @@ msgstr ""
 "lokon de la lanĉilo."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3553,12 +3579,12 @@ msgstr ""
 "ekzemple sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3569,7 +3595,7 @@ msgstr ""
 "vin ree al la instal-ekrano."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3583,12 +3609,12 @@ msgstr ""
 "ĝin aŭtomate.  Vidu la dokumentaron por la konkreta operacia sistemo."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Lanĉila sperta elekto"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/es.po b/docs/installer/es.po
index 1af3a55e..4aa8618c 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-05 10:32+0000\n"
 "Last-Translator: Jose Manuel López <rocholc@hotmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1136,21 +1136,22 @@ msgstr ""
 "selección conservadora. "
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particionado de disco personalizado con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1163,18 +1164,19 @@ msgstr ""
 "lo contrario, su sistema no arrancará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Ajuste la estructura de su(s) disco(s) aquí. Se pueden añadir y quitar "
 "particiones, cambiar el sistema de archivos de una partición o cambiar su "
 "tamaño, e incluso echar un vistazo antes de empezar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1183,7 +1185,7 @@ msgstr ""
 "como una unidad USB. Por ejemplo, sda, sdb y sdc si se encuentran tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1192,7 +1194,7 @@ msgstr ""
 "del disco de almacenaje seleccionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1202,15 +1204,34 @@ msgstr ""
 "montaje, cambie el tamaño o elimínela."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continue hasta que ajuste todo a su gusto."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Haga click en <guibutton>Hecho</guibutton> cuando esté listo."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1414,22 +1435,22 @@ msgstr ""
 "megabytes."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalación con DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Febrero 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1444,7 +1465,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1455,7 +1476,7 @@ msgstr ""
 "by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1466,7 +1487,7 @@ msgstr ""
 "www.neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1476,13 +1497,13 @@ msgstr ""
 "<link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Equipo de "
 "Documentación</link> si puede ayudar a mejorar este manual."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1491,8 +1512,8 @@ msgstr ""
 "Nadie verá las imágenes que puede ver en este manual. Las imágenes que verá "
 "dependerán de su hardware y las decisiones que tomó durante la instalación."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1679,11 +1700,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1885,8 +1901,8 @@ msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Esta ayuda se encuentra traducida en el idioma de su elección con la tecla F2"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3634,11 +3650,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Si ha elegido Grub 2 como su gestor de arranque, no se puede utilizar esta "
 "herramienta para editar las entradas en este paso, pulse \"Siguiente\". Hay "
@@ -3646,7 +3663,7 @@ msgstr ""
 "lugar."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3657,7 +3674,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3666,7 +3683,7 @@ msgstr ""
 "entrada y marcar una como la predeterminada."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3674,7 +3691,7 @@ msgstr ""
 "renombrar completamente."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3683,7 +3700,7 @@ msgstr ""
 "que seleccione otra."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3700,17 +3717,25 @@ msgstr "Opciones principales del cargador de arranque"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"../es/dx2-setupBootloader."
 "png\" align=\"center\" xml:id=\"setupBootloader-im1\" format=\"PNG\" /> </"
 "imageobject>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3719,7 +3744,7 @@ msgstr ""
 "elinstalador del cargador de arranque, aquí puede cambiarla."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3730,17 +3755,17 @@ msgstr ""
 "permitir a Mageia crear uno nuevo."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Los menús gráficos de Mageia son buenos y bonitos :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Usando el cargador de arranque de Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3752,7 +3777,7 @@ msgstr ""
 "Mageia intentará añadirlos al nuevo menú de arranque."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3761,7 +3786,7 @@ msgstr ""
 "opcionalademás del tradicional GRUB y de Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3772,7 +3797,7 @@ msgstr ""
 "defecto."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3781,12 +3806,12 @@ msgstr ""
 "en la página de resumen durante la instación."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Usando un cargador de arranque existente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3799,7 +3824,7 @@ msgstr ""
 "permitirá cambiar el lugar de instalación del cargador de arranque."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3810,12 +3835,12 @@ msgstr ""
 "por ejemplo sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3826,7 +3851,7 @@ msgstr ""
 "al instalador."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3841,12 +3866,12 @@ msgstr ""
 "sistema operativo en cuestión."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Opción avanzada del cargador de arranque"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/et.po b/docs/installer/et.po
index a065d5d4..bebaa956 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-22 01:00+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -99,9 +99,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 ""
@@ -121,9 +121,9 @@ msgid ""
 "source selection determines which packages will be available for selection "
 "during the next steps."
 msgstr ""
-"Siin on näha juba tuvastatud andmekandjad ehk tarkvarahoidlad. Võite "
-"lisada ka teisi allikaid, kust tarkvarapakette hankida, näiteks plaadi pealt "
-"või internetist. Allikate valik määrab, milliseid tarkvarapakette saab "
+"Siin on näha juba tuvastatud andmekandjad ehk tarkvarahoidlad. Võite lisada "
+"ka teisi allikaid, kust tarkvarapakette hankida, näiteks plaadi pealt või "
+"internetist. Allikate valik määrab, milliseid tarkvarapakette saab "
 "järgmistel etappidel kasutada."
 
 #. type: Content of: <section><para>
@@ -160,32 +160,32 @@ msgid ""
 "packages. However, after adding an online mirror, installer will find the "
 "needed 32 bit packages there."
 msgstr ""
-"Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid "
-"32-bitiseid rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, "
-"märkides selleks ära mõni pakutud võrguprotokoll. 64-bitise DVD "
-"ISO-tõmmis sisaldab ainult 64-bitiseid ja arhitektuurist sõltumatuid "
-"tarkvarapakette, mistõttu selle abil ei saa uuendada 32-bitiseid "
-"rakendusi. Kuid pärast võrgupeegli lisamist leiab paigaldusprogramm "
-"ise sealt üles vajalikud 32-bitised tarkvarapaketid."
+"Kui uuendate 64-bitist paigaldust, milles võib leiduda mõningaid 32-bitiseid "
+"rakendusi, on soovitatav sellel ekraanil lisada võrgupeegel, märkides "
+"selleks ära mõni pakutud võrguprotokoll. 64-bitise DVD ISO-tõmmis sisaldab "
+"ainult 64-bitiseid ja arhitektuurist sõltumatuid tarkvarapakette, mistõttu "
+"selle abil ei saa uuendada 32-bitiseid rakendusi. Kuid pärast võrgupeegli "
+"lisamist leiab paigaldusprogramm ise sealt üles vajalikud 32-bitised "
+"tarkvarapaketid."
 
 #. type: Content of: <section><info><title>
 #: en/addUser.xml:4
 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
-#.  marja 2013-04-26 added new note
+#.        "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:27
 msgid ""
@@ -423,17 +423,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 ""
@@ -684,8 +684,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 ""
@@ -739,8 +739,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:20
 msgid ""
@@ -1114,21 +1114,22 @@ msgstr ""
 "tasub valides olla pigem konservatiivne."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1141,18 +1142,19 @@ msgstr ""
 "ole süsteemi võimalik üldse laadida."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Siin saab kohandada ketta või ketaste jagamist: eemaldada või luua "
 "partitsioone, muuta partitsiooni failisüsteemi või suurust ning isegi enne "
 "alustamist näha, mida partitsioon sisaldab."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1162,7 +1164,7 @@ msgstr ""
 "olema kolm salvestusseadet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1171,7 +1173,7 @@ msgstr ""
 "<guibutton>Kustuta kõik</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1181,15 +1183,36 @@ msgstr ""
 "või ka kustutada."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1303,10 +1326,10 @@ msgid ""
 "and draging the gap between both partitions. See the screen-shot below."
 msgstr ""
 "Selle valiku korral näitab paigaldusprogramm alles jäävat Windowsi "
-"partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena "
-"ning nende all näeb kavandatud suurusi. Ühtlasi on teil võimalus "
-"neid suurusi muuta, klõpsates partitsioonide vahel asuvale tühialale "
-"ja seda lohistades. Seda näitab allolev pilt."
+"partitsiooni helesinisena ja tulevast Mageia partitsiooni tumesinisena ning "
+"nende all näeb kavandatud suurusi. Ühtlasi on teil võimalus neid suurusi "
+"muuta, klõpsates partitsioonide vahel asuvale tühialale ja seda lohistades. "
+"Seda näitab allolev pilt."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
 #: en/doPartitionDisks.xml:89
@@ -1396,22 +1419,22 @@ msgstr ""
 "paarisarv."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Paigaldamine DrakX'i abil"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Veebruar 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1426,7 +1449,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1437,7 +1460,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1448,7 +1471,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1459,13 +1482,13 @@ msgstr ""
 "ns6:href=\"https://wiki.mageia.org/en/Documentation_team"
 "\">dokumentatsioonimeeskonnaga</link>."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1475,8 +1498,8 @@ msgstr ""
 "millised ekraanid on näha, sõltub teie riistvarast ja paigaldamise käigus "
 "langetatud valikutest."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1485,9 +1508,9 @@ msgstr "</note>"
 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
@@ -1547,10 +1570,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 ""
@@ -1662,11 +1685,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1749,9 +1767,9 @@ msgid ""
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
-"Lisada mõningaid kerneli võtmeid, vajutades klahvile <emphasis "
-"role=\"bold\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis "
-"role=\"bold\">e</emphasis> UEFI süsteemi korral."
+"Lisada mõningaid kerneli võtmeid, vajutades klahvile <emphasis role=\"bold"
+"\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis role=\"bold\">e</"
+"emphasis> UEFI süsteemi korral."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:104
@@ -1825,8 +1843,8 @@ msgstr ""
 #: en/installer.xml:140
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
-"Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades "
-"(ainult tavapärases süsteemis)"
+"Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades (ainult tavapärases "
+"süsteemis)"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:143
@@ -1875,17 +1893,17 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Abi tõlgitakse keelde, mis on valitud klahviga F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
-"Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis "
-"leiab meie Wiki-lehelt <link ns2:href=\"https://wiki.mageia.org/en/How_"
-"to_set_up_kernel_options\">https://wiki.mageia.org/en/How_to_set_"
-"up_kernel_options</link>"
+"Täpsemat teavet kerneli võtmete kohta tavapärases ja UEFI süsteemis leiab "
+"meie Wiki-lehelt <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:180
@@ -2077,10 +2095,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 ""
@@ -2121,9 +2139,9 @@ msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 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
@@ -2242,18 +2260,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
@@ -2582,8 +2600,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 ""
@@ -2958,9 +2976,8 @@ msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
-"- md5sum kasutamiseks: [minukonto@localhost]$ <userinput>md5sum "
-"tõmmisefail.iso/"
-"asukoht</userinput>."
+"- md5sum kasutamiseks: [minukonto@localhost]$ <userinput>md5sum tõmmisefail."
+"iso/asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:296
@@ -2969,8 +2986,7 @@ msgid ""
 "image/file.iso</userinput>."
 msgstr ""
 "- sha1sum kasutamiseks: [minukonto@localhost]$ <userinput>sha1sum "
-"tõmmisefail.iso/"
-"asukoht</userinput>."
+"tõmmisefail.iso/asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:299
@@ -3212,8 +3228,8 @@ msgstr ""
 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 ""
@@ -3545,10 +3561,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 ""
@@ -3612,11 +3628,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> 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 "
@@ -3624,7 +3641,7 @@ msgstr ""
 "tööriista <code>grub-customizer</code>."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3635,7 +3652,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3644,14 +3661,14 @@ msgstr ""
 "kastikeses, millega see muudetakse vaikimisi kirjeks."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 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><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3660,7 +3677,7 @@ msgstr ""
 "kasutamata võimaluse midagi valida."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3674,21 +3691,29 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
 
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-setupBootloader.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"setupBootloader-im1\"/> </"
 "imageobject>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3697,7 +3722,7 @@ msgstr ""
 "paigaldusprogramm automaatselt, saab siin neid muuta."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3708,17 +3733,17 @@ msgstr ""
 "Mageial luua uus."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: 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><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Mageia alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3731,7 +3756,7 @@ msgstr ""
 "alglaadimismenüüsse."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3740,7 +3765,7 @@ msgstr ""
 "uuemat alglaadurit GRUB2."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3751,7 +3776,7 @@ msgstr ""
 "kasutada vaikimisi GRUBi alglaadurit."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3760,12 +3785,12 @@ msgstr ""
 "paigaldamise ajal kokkuvõtteleheküljel."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Olemasoleva alglaaduri kasutamine"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3778,7 +3803,7 @@ msgstr ""
 "muuta alglaaduri paigaldamise asukohta."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3789,12 +3814,12 @@ msgstr ""
 "partitsioneerimisetapil, nt sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3806,7 +3831,7 @@ msgstr ""
 "ekraanile."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3821,12 +3846,12 @@ msgstr ""
 "dokumentatsiooni."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Alglaaduri täpsemad valikud"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3843,14 +3868,14 @@ msgstr ""
 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 ""
@@ -3890,7 +3915,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 ""
@@ -3933,9 +3958,9 @@ msgid ""
 "guibutton> to find very useful advice about how to solve the problem."
 msgstr ""
 "Seejärel klõpsake draksoundi ehk \"Heli seadistamise\" tööriistas nupule "
-"<guibutton>Muud valikud</guibutton> ja seejärel nupule "
-"<guibutton>Probleemi otsimine</guibutton>, kust leiab mitmeid häid "
-"soovitusi, kuidas hädast üle saada."
+"<guibutton>Muud valikud</guibutton> ja seejärel nupule <guibutton>Probleemi "
+"otsimine</guibutton>, kust leiab mitmeid häid soovitusi, kuidas hädast üle "
+"saada."
 
 #. type: Content of: <section><section><info><title>
 #: en/soundConfig.xml:41
@@ -3967,12 +3992,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 ""
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index c058419e..d1741f4b 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-10 13:07+0100\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
 "eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.6.9\n"
 
@@ -102,11 +102,9 @@ msgstr "eu"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)"
 
-#. 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 ""
@@ -177,24 +175,19 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
 
-#. 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
-#. 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
-#. marja 2013-04-26 added new note
+#.  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 
+#.        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 
+#.  marja 2013-04-26 added new note 
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:27
 msgid ""
@@ -434,20 +427,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Aukeratu muntatze-puntuak"
 
-#. 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
-#. 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
+#.  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 
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
@@ -603,8 +593,7 @@ msgstr ""
 msgid "Package Group Selection"
 msgstr "Pakete-taldearen hautapena"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackageGroups.xml:10
 msgid ""
@@ -665,8 +654,7 @@ msgstr ""
 msgid "Choose Individual Packages"
 msgstr "Aukeratu Banakako Paketeak"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackagesTree.xml:11
 msgid ""
@@ -703,8 +691,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfiguratu zure Zerbitzuak"
 
-#. 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 ""
@@ -757,8 +745,8 @@ msgstr "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
 msgid "Configure your Timezone"
 msgstr "Konfiguratu zure Denbora-Eremua"
 
-#. 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:20
 msgid ""
@@ -904,9 +892,7 @@ msgstr ""
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Txartel Grafikoa eta Pantaila Konfigurazioa"
 
-#. Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX"
-#. in the code by "configureX_chooser", because this is the correct filename
-#. for this page
+#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
 #: en/configureX_chooser.xml:11
 msgid ""
@@ -1136,21 +1122,22 @@ msgstr ""
 "kontserbadorea izan behar da."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Pertsonalizatua disko partizioak DiskDrake-rekin"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1163,18 +1150,19 @@ msgstr ""
 "sistema ez izango da abiarazi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Hemen zure disko gogor(ren) egitura estutu. Partizioak gehitu eta kendu "
 "daitezke, partizio bateko sistema edo tamaina alda daiteke, eta \n"
 "haietan hasi baino lehen dagoena arren ikusi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1184,7 +1172,7 @@ msgstr ""
 "badira."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1193,7 +1181,7 @@ msgstr ""
 "partizio guztiak garbitzeko"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1202,15 +1190,36 @@ msgstr ""
 "aukeratu fitxategi sistema eta muntatze puntua, tamainaz aldatu edo garbitu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Jarraitu dena zure nahiei egokitu arte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik <guibutton>Eginda</guibutton> prest zaudenean."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1413,23 +1422,22 @@ msgid ""
 msgstr "Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "DrakX-rekin Instalazioa"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "2014ko Otsaila"
 
-#. type: Content of:
-#. <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1444,7 +1452,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1455,7 +1463,7 @@ msgstr ""
 "creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1466,7 +1474,7 @@ msgstr ""
 "\">NeoDoc</link>-k garatuta."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1476,13 +1484,13 @@ msgstr ""
 "wiki.mageia.org/en/Documentation_team\">Dokumentazio Talde</link>ra bada "
 "eskuliburu hau hobetzen lagundu ahal baduzu."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1492,8 +1500,8 @@ msgstr ""
 "dituzun irudiak zure hardwarea eta instalazioan zehar hartutako erabakien "
 "araberakoa izango da."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1502,10 +1510,10 @@ msgstr "</note>"
 msgid "Congratulations"
 msgstr "Zorionak"
 
-#. 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"
+#.  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
 msgid ""
@@ -1565,10 +1573,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formateatzen"
 
-#. 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 ""
@@ -1680,11 +1688,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1896,8 +1899,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Laguntzak F2 teklaz aukeratutako hizkuntza emaitza du."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2100,15 +2103,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Eguneraketak"
 
-#. 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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2150,12 +2148,10 @@ msgstr "Ondoren, sakatu <guibutton>Hurrengoa</guibutton> jarraitzeko"
 msgid "Media Selection (Nonfree)"
 msgstr "Baliabide Aukeraketa (Nonfree)"
 
-#. 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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html
-#. filename was wrong)
+#.  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-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
 msgid ""
@@ -2272,21 +2268,19 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Hainbat parametroen laburpena"
 
-#. 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"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry,
-#. configureServices and SecurityLevel out to separate files
+#. 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
 msgid ""
@@ -2619,8 +2613,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Segurtasun-maila"
 
-#. 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 ""
@@ -2698,15 +2692,13 @@ msgstr "Instalazioa Klasiko baliabidea"
 msgid "Common features"
 msgstr "Ezaugarri komunak"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:29
 msgid "These ISOs use the traditional installer called drakx."
 msgstr ""
 "ISO hauek DrakX deituriko Instalatzaile tradizionalak erabilitzen dituzte."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:34
 msgid ""
 "They are able to make a clean install or an update from previous releases."
@@ -2719,14 +2711,12 @@ msgstr ""
 msgid "DVD"
 msgstr "DVD"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:45
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "Baliabide ezberdinak 32 edo 64 biteko arkitekturentzat."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:49
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
@@ -2735,14 +2725,12 @@ msgstr ""
 "Tresna batzuk Ongi etorri pantailan eskuragarri daude: Berreskuratze "
 "Sistema, Memoria Testa, Hardware hautemate tresna."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:54
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "DVD bakoitzak mahaigaineko ingurune eta hizkuntza asko dauka."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:59
 msgid ""
 "You'll be given the choice during the installation to add non free software."
@@ -2753,8 +2741,7 @@ msgstr "Instalazioan zehar software ez librea gehitzeko aukera izango duzue."
 msgid "DVD dual arch"
 msgstr "arkitektura bikoitzeko DVDa"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:70
 msgid ""
 "Both architectures are present on the same medium, the choice is made "
@@ -2763,14 +2750,12 @@ msgstr ""
 "Arkitektura biak baliabide berean agertzen dira, aukera automatikoki egiten "
 "da atzemandako CPU-aren arabera."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:75
 msgid "Uses Xfce desktop only."
 msgstr "Xfce mahaigaina soilik erabiltzen du."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:79
 msgid ""
 "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
@@ -2779,8 +2764,7 @@ msgstr ""
 "Hizkuntza guztiak ez daude eskuragarri. (be, bg, ca, de, en, es, fr, it, mk, "
 "pl, pt, ru, sv, uk) EGIAZTAPENAREN ZAIN!"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:84
 msgid "It contains non free software."
 msgstr "Software ez librea dauka."
@@ -2790,8 +2774,7 @@ msgstr "Software ez librea dauka."
 msgid "Live media"
 msgstr "Live baliabidea"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:98
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
@@ -2800,21 +2783,18 @@ msgstr ""
 "Distribuzioa aurreikusteko HDD baten instalatu gabe, eta aukeran Mageia zure "
 "HDD-an instalatzeko erabil daiteke."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:103
 msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
 msgstr "ISO bakoitzak mahaigain ingurune bakarra (KDE edo GNOME) dauka."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:108 en/SelectAndUseISOs2.xml:172
 #: en/SelectAndUseISOs2.xml:190 en/SelectAndUseISOs2.xml:220
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "32 edo 64 biteko arkitektura media ezberdinak."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:112
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
@@ -2825,8 +2805,7 @@ msgstr ""
 "erabiliko dira, ezin dira aurreko bertsioetatik eguneratzeko erabili.</"
 "emphasis>"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:118
 msgid "They contain non free software."
 msgstr "Software ez librea dute."
@@ -2836,21 +2815,18 @@ msgstr "Software ez librea dute."
 msgid "Live CD KDE"
 msgstr "KDE-ren Live CDa"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:128 en/SelectAndUseISOs2.xml:164
 msgid "KDE desktop environment only."
 msgstr "KDE mahaigaineko ingurunea soilik."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:132 en/SelectAndUseISOs2.xml:150
 #: en/SelectAndUseISOs2.xml:224
 msgid "English language only."
 msgstr "Ingelera hizkuntza soilik"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:154
 msgid "32 bit only."
 msgstr "32 bit soilik."
@@ -2860,8 +2836,7 @@ msgstr "32 bit soilik."
 msgid "Live CD GNOME"
 msgstr "GNOME-ren Live CD-a"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:146 en/SelectAndUseISOs2.xml:182
 msgid "GNOME desktop environment only."
 msgstr "GNOME mahaigaineko ingurunea soilik."
@@ -2871,8 +2846,7 @@ msgstr "GNOME mahaigaineko ingurunea soilik."
 msgid "Live DVD KDE"
 msgstr "KDE-ren Live DVD-a"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:168 en/SelectAndUseISOs2.xml:186
 msgid "All languages are present."
 msgstr "Hizkuntza guztiak presente daude."
@@ -2887,8 +2861,7 @@ msgstr "GNOME-ren Live DVD-a"
 msgid "Boot-only CD media"
 msgstr "Abioko CD baliabidea soilik"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:204
 msgid ""
 "Each one is a small image that contains no more than that which is needed to "
@@ -2902,8 +2875,7 @@ msgstr ""
 "PC disko gogorrean egon daiteke, tokiko drive baten, sare lokalean zein "
 "Interneten."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:213
 msgid ""
 "These media are very light (less than 100 MB) and are convenient when "
@@ -2919,8 +2891,7 @@ msgstr ""
 msgid "boot.iso"
 msgstr "boot.iso"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:234
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
@@ -2934,8 +2905,7 @@ msgstr ""
 msgid "boot-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:245
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
@@ -3139,14 +3109,12 @@ msgstr ""
 msgid "You can also use the dd tool in a console:"
 msgstr "dd kontsola tresna bezala ere erabil dezakezu:"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:352
 msgid "Open a console"
 msgstr "Kontsola bat ireki"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:356
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
@@ -3154,8 +3122,7 @@ msgid ""
 msgstr ""
 "Bihurtu root komando <userinput> su - </userinput> (ez ahaztu finalean '-')"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:360
 msgid ""
 "<imageobject> <imagedata contentwidth=\"650\" fileref=\"../Root.png\"/> </"
@@ -3164,8 +3131,7 @@ msgstr ""
 "<imageobject> <imagedata contentwidth=\"650\" fileref=\"../Root.png\"/> </"
 "imageobject>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:367
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
@@ -3174,14 +3140,12 @@ msgstr ""
 "Entxufatu zure USBa (ez muntatu, hau ere esan dezake edozein aplikazio edo "
 "fitxategi kudeatzaile ez ireki  hori eskuratu eta irakurri, ezin)"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:373
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "Idatzi <userinput>fdisk-l</userinput> komandoa"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:376
 msgid ""
 "<imageobject> <imagedata fileref=\"../Fdisk.png\" contentwidth=\"650\"/> </"
@@ -3190,8 +3154,7 @@ msgstr ""
 "<imageobject> <imagedata fileref=\"../Fdisk.png\" contentwidth=\"650\"/> </"
 "imageobject>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:383
 msgid ""
 "Find the device name for your USB stick (by its size), for example /dev/sdb "
@@ -3200,8 +3163,7 @@ msgstr ""
 "Aurkitu zure USB gailuaren izena (bere tamainaren arabera), adibidez /dev/"
 "sdb goiko irudian, 8Go USB-makila."
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:389
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
@@ -3210,14 +3172,12 @@ msgstr ""
 "Agindua sartu: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX bs=1M</"
 "userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:392
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "Non X=zure dispositiboaren izena adibidez: /dev/sdc"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:394
 msgid ""
 "Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
@@ -3226,14 +3186,12 @@ msgstr ""
 "Adibidez: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
 "of=/dev/sdb bs=1M</userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:400
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Agindua sartu: # <userinput>sync</userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:404
 msgid "Unplug your USB stick, it is done"
 msgstr "Deskonektatu zure USB, eginda dago"
@@ -3290,8 +3248,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Aukeratu zure Herrialdea / Eskualdea"
 
-#. 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 ""
@@ -3625,11 +3583,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Aukeratu sagua"
 
-#. 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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3696,11 +3653,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "<code>Grub 2</code> zure abioko kargatzaile bezala aukeratu baduzu,  tresna "
 "hau ezin duzu erabili sarrerak aldatzeko urrats honetan, sakatu 'Hurrengoa'. "
@@ -3708,7 +3666,7 @@ msgstr ""
 "customizer</code> erabili behar duzu."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3719,7 +3677,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3728,14 +3686,14 @@ msgstr ""
 "lehenetsi gisa markatzea."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 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><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3744,7 +3702,7 @@ msgstr ""
 "kargatzen duena."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3757,24 +3715,29 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Abio kargatzailearen aukera nagusiak"
 
-#. 2012-08-12 Copied this page, setupBootloader.xml,  from
-#. setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere,
-#. except in this sentence.
-#. 2013-3-30 Removed refernce to bootloader expert page and suggest using
-#. grub2 where other grub2 systems exist
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
+#.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3783,7 +3746,7 @@ msgstr ""
 "ezberdinak nahiago badituzu, hemen alda ditzakezu."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3794,17 +3757,17 @@ msgstr ""
 "sortzea erabaki behar duzu."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "The mageia menuak grafikoa politak ditu :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Mageia abio kargatzailea erabiliz"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3816,7 +3779,7 @@ msgstr ""
 "gehiago baduzu, Mageia saiatuko da abio menu berrira gehitzen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3825,7 +3788,7 @@ msgstr ""
 "abioko kargatzailea gisa."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3836,7 +3799,7 @@ msgstr ""
 "badu."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3845,12 +3808,12 @@ msgstr ""
 "kargatzailea hemen erabiltzea da konponbiderik onena."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Existitzen den abio kargatzaile bat erabiliz"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3863,7 +3826,7 @@ msgstr ""
 "instalazio tokia aldatzen utziko dizu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3874,12 +3837,12 @@ msgstr ""
 "behar duzu, adibidez sda7 bezala."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3890,7 +3853,7 @@ msgstr ""
 "instalatzailera itzuliarazten dizu."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3904,12 +3867,12 @@ msgstr ""
 "sistema eragilearen dokumentazioa."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Abioko kargatzailearen aukera aurreratuak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3926,16 +3889,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "SCSI konfiguratu"
 
-#. 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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -3976,7 +3937,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Soinu Konfiguraketa"
 
-#. Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4053,13 +4014,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Baieztatzeko formateatu beharreko disko gogorra"
 
-#. 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
+#.  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 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 7c4fc861..c808a2a3 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-05 20:31+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -1148,21 +1148,22 @@ msgstr ""
 "prudent dans vos choix."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partitionnement personnalisé du disque avec DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1175,11 +1176,12 @@ msgstr ""
 "système ne pourra pas s'amorcer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Définir ici la disposition du(es)  disque(s). Il est possible de créer ou de "
 "supprimer des partitions, de changer le type du système de fichiers d'une "
@@ -1187,7 +1189,7 @@ msgstr ""
 "de démarrer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1197,7 +1199,7 @@ msgstr ""
 "s'ils sont trois."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1206,7 +1208,7 @@ msgstr ""
 "supprimer toutes les partitions du périphérique de stockage sélectionné."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1216,15 +1218,36 @@ msgstr ""
 "la redimensionner ou la supprimer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continuer jusqu'à ce que tout soit conforme aux désirs."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Cliquer sur <guibutton>Terminer</guibutton> quand tout est correct.."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1434,22 +1457,22 @@ msgstr ""
 "de Mo."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installation avec DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Février 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1464,7 +1487,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1475,7 +1498,7 @@ msgstr ""
 "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1486,7 +1509,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1496,13 +1519,13 @@ msgstr ""
 "à l'amélioration de ce manuel, veuillez contacter <link ns6:href=\"https://"
 "wiki.mageia.org/en/Documentation_team\">l'Equipe de documentation</link>."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1512,8 +1535,8 @@ msgstr ""
 "apparaissent, en fonction de votre matériel et des choix d'installation que "
 "vous faites."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1706,11 +1729,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1934,8 +1952,8 @@ msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "L'aide est traduite dans la langue sélectionnée en pressant la touche F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3717,11 +3735,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Si vous avez choisi <code>Grub 2</code> comme chargeur de démarrage, vous ne "
 "pouvez pas utliser cet outil pour modifier les entrées à cette étape, "
@@ -3730,7 +3749,7 @@ msgstr ""
 "place."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3741,7 +3760,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3751,7 +3770,7 @@ msgstr ""
 "risques."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3759,7 +3778,7 @@ msgstr ""
 "renommer complètement."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3768,7 +3787,7 @@ msgstr ""
 "pendant la phase de démarrage du système."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3786,17 +3805,25 @@ msgstr "Principales options du chargeur de démarrage"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3805,7 +3832,7 @@ msgstr ""
 "de ceux choisis automatiquement par l'installateur, les changer ici."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3816,17 +3843,17 @@ msgstr ""
 "ou autoriser Mageia à en créer un autre. "
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Les menus graphiques de Mageia sont superbes :) "
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Utiliser un chargeur de démarrage Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3839,7 +3866,7 @@ msgstr ""
 "nouveau menu de démarrage Mageia."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3848,7 +3875,7 @@ msgstr ""
 "plus de GRUB legacy et Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3859,7 +3886,7 @@ msgstr ""
 "chargeur de démarrage GRUB est utilisé."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3868,12 +3895,12 @@ msgstr ""
 "est disponible pendant l'installation à la page du résumé."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Utiliser un chargeur de démarrage existant.  "
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3886,7 +3913,7 @@ msgstr ""
 "permet de modifier le lieu d'installation du chargeur de démarrage."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3897,14 +3924,14 @@ msgstr ""
 "phase du partitionnement, par ex \"sda7\"."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3915,7 +3942,7 @@ msgstr ""
 "l'écran de l'installateur."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3930,12 +3957,12 @@ msgstr ""
 "Voir la documentation du système d'exploitation en question."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Option avancée du chargeur de démarrage "
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index a2b82f84..d42af212 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -874,19 +874,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
+"</imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -895,44 +895,61 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+msgid "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1094,22 +1111,22 @@ msgid "Also make sure all partitions are created with an even number of megabyte
 msgstr ""
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr ""
 
@@ -1124,7 +1141,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link "
@@ -1132,7 +1149,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link "
 "ns6:href=\"http://www.calenco.com\">Calenco CMS</link> developed by <link "
@@ -1140,28 +1157,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link "
 "ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
 "Team</link>, if you would like to help improve this manual."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr ""
 
@@ -1313,11 +1330,6 @@ msgid ""
 "</imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1482,8 +1494,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link "
@@ -2896,14 +2908,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" "
 "xml:id=\"setupBootloaderAddEntry-im1\" align=\"center\" format=\"PNG\" "
@@ -2911,26 +2923,26 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -2949,18 +2961,25 @@ msgstr ""
 msgid ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" "
 "fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" "
-"format=\"PNG\" /> </imageobject>"
+"format=\"PNG\"/> </imageobject>"
+msgstr ""
+
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: 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><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -2968,17 +2987,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -2987,14 +3006,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: 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><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3002,19 +3021,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 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><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3023,7 +3042,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3031,12 +3050,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3044,7 +3063,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3054,12 +3073,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on "
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index d0e598ce..d9ebd7cf 100644
--- a/docs/installer/hr.po
+++ b/docs/installer/hr.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-04-02 16:24+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/mageia/language/"
@@ -994,19 +994,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1015,44 +1018,65 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1221,22 +1245,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalacija pomoću "
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Veljača 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1251,7 +1275,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1259,7 +1283,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1267,28 +1291,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr ""
 
@@ -1443,11 +1467,6 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1635,8 +1654,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3048,14 +3067,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3063,27 +3082,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3098,21 +3117,32 @@ msgstr "Glavne postavke bootloadera"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"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><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: 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><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3120,17 +3150,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3139,14 +3169,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: 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><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3154,19 +3184,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 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><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3175,7 +3205,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3183,12 +3213,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3196,7 +3226,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3206,12 +3236,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/id.po b/docs/installer/id.po
index c965b8cf..9b362ade 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-07 00:01+0000\n"
 "Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -1125,21 +1125,22 @@ msgstr ""
 "sangat bijaksana jika Anda memilih yang sederhana."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1152,18 +1153,19 @@ msgstr ""
 "Anda tidak akan bisa berjalan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Atur tampilan disk Anda di sini. Anda bisa menghapus atau membuat partisi, "
 "mengubah filesystem partisi atau mengubah ukurannya dan menampilkan isinya "
 "sebelum Anda memulai."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1172,7 +1174,7 @@ msgstr ""
 "lainnya, seperti flashdisk. Contohnya sda, sdb dan sdc jika ada tiga."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1181,7 +1183,7 @@ msgstr ""
 "partisi pada perangkat penyimpanan terpilih"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1190,15 +1192,36 @@ msgstr ""
 "tampilkan, atau pilih filesystem dan titik kait, ubah ukuran atau bersihkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Lanjutkan hingga Anda mengatur semua yang Anda inginkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik <guibutton>Selesai</guibutton> jika sudah siap."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1401,22 +1424,22 @@ msgid ""
 msgstr "Juga pastikan semua partisi dibuat dengan penomoran megabite."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalasi dengan DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Februari 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1431,7 +1454,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1442,7 +1465,7 @@ msgstr ""
 "creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1453,7 +1476,7 @@ msgstr ""
 "biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1463,13 +1486,13 @@ msgstr ""
 "ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Tim Dokumentasi</"
 "link>, jika Anda ingin membantu memperbaiki manual ini."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1479,8 +1502,8 @@ msgstr ""
 "manual ini. Layar mana yang akan Anda lihat, tergantung pada hardware dan "
 "pilihan yang Anda buat saat menginstall."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1667,11 +1690,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1884,8 +1902,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Bantuan diterjemahkan ke dalam bahasa yang dipilih dengan tombol F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3633,11 +3651,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Jika Anda memilih <code>Grub 2</code> sebagai bootloader, Anda tidak bisa "
 "menggunakan alat ini untuk mengubah entri pada langkah ini, tekan "
@@ -3645,7 +3664,7 @@ msgstr ""
 "manual atau gunakan <code>grub-customizer</code>."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3656,7 +3675,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3665,14 +3684,14 @@ msgstr ""
 "dan memilih kotak untuk membuat entri menjadi bawaan."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 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><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3681,7 +3700,7 @@ msgstr ""
 "tidak memilih saat mulai berjalan."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3698,17 +3717,25 @@ msgstr "Pilihan utama Bootloader"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3717,7 +3744,7 @@ msgstr ""
 "secara otomatis oleh installer, Anda bisa mengubahnya di sini."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3728,17 +3755,17 @@ msgstr ""
 "atau membiarkan Mageia membuatnya."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Menu grafis Mageia sangat cantik :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Gunakan bootloader Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3751,7 +3778,7 @@ msgstr ""
 "baru."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3760,7 +3787,7 @@ msgstr ""
 "tambahan GRUB legacy dan Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3770,7 +3797,7 @@ msgstr ""
 "(legacy) dan tidak akan dikenali jika bootloader GRUB bawaan digunakan."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3779,12 +3806,12 @@ msgstr ""
 "Ringkasan selama instalasi."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Gunakan bootloader yang ada"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3797,7 +3824,7 @@ msgstr ""
 "mengubah lokasi instalasi bootloader."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3808,14 +3835,14 @@ msgstr ""
 "pemartisian sebelumnya, misalnya sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3826,7 +3853,7 @@ msgstr ""
 "akan membawa Anda kembali ke layar installer."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3840,12 +3867,12 @@ msgstr ""
 "menambahkan secara otomatis. Lihat pada dokumentasi sistem operasi."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Pilihan lanjutan bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/it.po b/docs/installer/it.po
index f3e917f5..5949200f 100644
--- a/docs/installer/it.po
+++ b/docs/installer/it.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-12 20:14+0000\n"
 "Last-Translator: Roberto Albano <randyichinose@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
@@ -983,21 +983,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partizionamento personalizzato con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1010,18 +1011,19 @@ msgstr ""
 "literal> NON deve essere impostata, altrimenti il sistema non sarà avviabile."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Imposta il layout del tuo disco/i. Puoi rimuovere o creare partizioni, "
 "cambiare il filesystem di una partizione o cambiare la sua dimensione e "
 "anche, prima di partire, di vederne il contenuto."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1031,7 +1033,7 @@ msgstr ""
 "sono tre."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1040,7 +1042,7 @@ msgstr ""
 "partizioni sul dispositivo di storage selezionato."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1050,15 +1052,34 @@ msgstr ""
 "oppure cancellala."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continua sino a quando non avrai impostato tutto come desideri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Quando hai completato premi <guibutton>Finito</guibutton> "
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1233,22 +1254,22 @@ msgstr ""
 "megabytes."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installazione con DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Febbraio 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1263,7 +1284,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1274,7 +1295,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1285,7 +1306,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1295,21 +1316,21 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Documentation_team\">Team Documentazione</"
 "link>, se vuoi aiutare a migliorare questo manuale."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1487,11 +1508,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1679,8 +1695,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "L'aiuto viene tradotto nella lingua scelta con il tasto F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3314,14 +3330,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3332,27 +3348,27 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3369,17 +3385,25 @@ msgstr "Opzioni principali del bootloader"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3388,7 +3412,7 @@ msgstr ""
 "automatico dall'installer puoi modificare da qua."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3399,17 +3423,17 @@ msgstr ""
 "Mageia di crearne uno nuovo."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "I menù grafici di Mageia sono belli :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3418,7 +3442,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3427,7 +3451,7 @@ msgstr ""
 "Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3438,7 +3462,7 @@ msgstr ""
 "default è GRUB."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3447,12 +3471,12 @@ msgstr ""
 "l'installazione."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Usare un bootloader esistente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3461,7 +3485,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3472,14 +3496,14 @@ msgstr ""
 "la precedente fase di partizionamento esempio: sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3487,7 +3511,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3497,12 +3521,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Opzioni avanzate del Bootloader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index 83fe3bcd..f2f7aaf7 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-04 13:51+2100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -1127,21 +1127,22 @@ msgstr ""
 "te zijn met uw keuze."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Aangepaste schijfpartitionering met DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1154,18 +1155,19 @@ msgstr ""
 "uw systeem niet opstarten."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Pas hier de partitionering van uw harde schijf of schijven aan. U kunt "
 "partities verwijderen of aanmaken, het bestandssysteem of de grootte van een "
 "partitie wijzigen en zelfs bekijken wat ze bevatten voor u start."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1175,7 +1177,7 @@ msgstr ""
 "als er drie zijn."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1184,7 +1186,7 @@ msgstr ""
 "geselecteerde opslag apparaat te verwijderen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1194,15 +1196,36 @@ msgstr ""
 "aan of verwijder haar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Ga verder totdat alles naar uw wensen is aangepast."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik dan op <guibutton>Klaar</guibutton>."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1317,9 +1340,9 @@ msgid ""
 "and draging the gap between both partitions. See the screen-shot below."
 msgstr ""
 "Bij deze optie is de resterende Windowspartitie lichtblauw en de nieuwe "
-"Mageiapartitie donkerblauw. Eronder ziet u hun voorgestelde groottes. U "
-"kunt die wijzigen door op de spleet tussen deze partities te klikken, en "
-"naar links of rechts te slepen. Zie de schermafbeelding hieronder."
+"Mageiapartitie donkerblauw. Eronder ziet u hun voorgestelde groottes. U kunt "
+"die wijzigen door op de spleet tussen deze partities te klikken, en naar "
+"links of rechts te slepen. Zie de schermafbeelding hieronder."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
 #: en/doPartitionDisks.xml:89
@@ -1410,22 +1433,22 @@ msgstr ""
 "aantal megabytes."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installeren met DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Februari 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1440,7 +1463,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1451,7 +1474,7 @@ msgstr ""
 "by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1462,7 +1485,7 @@ msgstr ""
 "href=\"http://www.neodoc.biz\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1473,13 +1496,13 @@ msgstr ""
 "\">Documentatie Team</link>, als u mee wilt helpen deze handleiding te "
 "verbeteren."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1489,8 +1512,8 @@ msgstr ""
 "worden. Welke schermen u krijgt hangt af van uw systeem en van de keuzes die "
 "u tijdens het installeren maakt."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1678,11 +1701,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1894,8 +1912,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "De hulp wordt in de gekozen taal vertaald met de F2 toets."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3653,11 +3671,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Als u <code>Grub 2</code> als opstartlader heeft gekozen, kunt u deze tool "
 "niet gebruiken om ingangen aan te passen. Klik op 'Volgende'. U kunt wel "
@@ -3665,7 +3684,7 @@ msgstr ""
 "customizer</code> gebruiken."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3676,7 +3695,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3686,7 +3705,7 @@ msgstr ""
 "standaard ingang wordt."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3694,7 +3713,7 @@ msgstr ""
 "hernoemen."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3703,7 +3722,7 @@ msgstr ""
 "maakt tijdens het opstarten van uw computer."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3720,17 +3739,25 @@ msgstr "Algemene opties voor de opstartlader"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3739,7 +3766,7 @@ msgstr ""
 "hier veranderen."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3750,17 +3777,17 @@ msgstr ""
 "of dat u Mageia toestaat een nieuwe te creëren."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "De Mageia grafische menu's zijn mooi :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "De Mageia-opstartlader gebruiken"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3772,7 +3799,7 @@ msgstr ""
 "heeft, probeert Mageia ze aan uw nieuwe Mageia opstartmenu toe te voegen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3781,7 +3808,7 @@ msgstr ""
 "opstartlader te nemen, ook GRUB2 als keuze aan."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3792,7 +3819,7 @@ msgstr ""
 "opstartlader gebruikt wordt."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3801,12 +3828,12 @@ msgstr ""
 "tijdens het installeren in de Overzichtspagina beschikbaar is."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Een bestaande opstartlader gebruiken"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3819,7 +3846,7 @@ msgstr ""
 "de locatie kunt veranderen waar de opstartlader geplaatst wordt."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3830,12 +3857,12 @@ msgstr ""
 "bijvoorbeeld \"sda7\"."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3846,7 +3873,7 @@ msgstr ""
 "naar het installatiescherm."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3861,12 +3888,12 @@ msgstr ""
 "documentatie van het betreffende besturingssysteem."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Geavanceerde optie voor de opstartlader"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 6dc0d366..ae433d7a 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-14 19:12+0000\n"
 "Last-Translator: Daniel Napora <napcok@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1032,21 +1032,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1059,18 +1060,19 @@ msgstr ""
 "to uruchomienie systemu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Tutaj możesz dostosować podział swojego dysku na partycje.  Możesz usuwać i "
 "tworzyć partycje, zmieniać system plików lub rozmiar partycji, a nawet "
 "sprawdzać co znajduje się na poszczególnych partycjach."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1080,7 +1082,7 @@ msgstr ""
 "urządzenia."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1089,7 +1091,7 @@ msgstr ""
 "partycje znajdujące się na wybranym dysku."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1099,18 +1101,39 @@ msgstr ""
 "ją usunąć."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Kontynuuj aż do momentu gdy skonfigurujesz wszystko zgodnie ze swoimi "
 "preferencjami."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</guibutton>."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
+"imagedata> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr ""
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1302,22 +1325,22 @@ msgstr ""
 "liczbę megabajtów."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalacja za pomocą DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1332,7 +1355,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1343,7 +1366,7 @@ msgstr ""
 "org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1354,7 +1377,7 @@ msgstr ""
 "www.neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1364,13 +1387,13 @@ msgstr ""
 "chcesz pomóc poprawić dokumentację skontaktuj się z <link ns6:href=\"https://"
 "wiki.mageia.org/en/Documentation_team\">Zespołem Dokumentacji</link>, "
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1380,8 +1403,8 @@ msgstr ""
 "To które ekrany zobaczysz zależy od tego jaki posiadasz sprzęt oraz jakich "
 "wyborów dokonasz podczas instalacji."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1563,11 +1586,6 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1750,8 +1768,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3300,14 +3318,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3315,27 +3333,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3350,24 +3368,32 @@ msgstr "Podstawowe opcje programu rozruchowego"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: 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><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3375,17 +3401,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3394,14 +3420,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: 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><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3409,19 +3435,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 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><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3430,7 +3456,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3438,12 +3464,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3451,7 +3477,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3461,12 +3487,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 061b60c5..26765325 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-05 02:23+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -1135,21 +1135,22 @@ msgstr ""
 "seleções."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Personalização do particionamento de disco com DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"> </"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1162,18 +1163,19 @@ msgstr ""
 "literal> NÃO deve ser feita, caso contrário, seu sistema não inicializará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Ajuste o layout de seu(s) disco(s) aqui. Você pode remover ou criar "
 "partições, mudar o sistema de arquivos de uma partição ou alterar o seu "
 "tamanho e até mesmo ver o que há neles antes de começar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1183,7 +1185,7 @@ msgstr ""
 "deles."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1192,7 +1194,7 @@ msgstr ""
 "no dispositivo de armazenamento selecionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1202,15 +1204,36 @@ msgstr ""
 "montagem, redimensioná-la ou limpá-la."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continue até que você ajustar tudo como desejar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Click <guibutton>Ok</guibutton> quando estiver pronto."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1417,22 +1440,22 @@ msgstr ""
 "número par de megabytes."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalando com DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Fevereiro 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1447,7 +1470,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1458,7 +1481,7 @@ msgstr ""
 "creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1469,7 +1492,7 @@ msgstr ""
 "biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1479,13 +1502,13 @@ msgstr ""
 "<link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Equipe de "
 "Documentação</link>, se você deseja ajudar a melhorar este manual."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1495,8 +1518,8 @@ msgstr ""
 "telas que você verá dependem de seu hardware e as escolhas que você faz "
 "durante a instalação."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1685,11 +1708,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1905,8 +1923,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "A ajuda é traduzida no idioma escolhido com a tecla F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3668,11 +3686,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Se você escolheu <code>Grub 2</code> como seu gerenciador de inicialização, "
 "você não pode usar esta ferramenta para editar entradas neste passo, "
@@ -3680,7 +3699,7 @@ msgstr ""
 "cfg</code> ou usar <code>grub-customizer</code> em seu lugar."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3691,7 +3710,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3700,7 +3719,7 @@ msgstr ""
 "de uma entrada e selecionar a caixa de uma entrada para torná-la padrão."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3708,7 +3727,7 @@ msgstr ""
 "completamente."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3717,7 +3736,7 @@ msgstr ""
 "durante a inicialização."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3734,17 +3753,25 @@ msgstr "Principais Opções do Gerenciador de Inicialização"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
 "imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupBootloader.png\" "
 "align=\"center\" format=\"PNG\" xml:id=\"setupBootloader-im1\"></imagedata> "
 "</imageobject>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3754,7 +3781,7 @@ msgstr ""
 "instalador, você pode alterá-las aqui."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3765,17 +3792,17 @@ msgstr ""
 "inicialização existente, ou permitir que a Mageia crie um novo."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "O menu gráfico da Mageia é ótimo :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Usando o Gerenciador de Inicialização da Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3788,7 +3815,7 @@ msgstr ""
 "ao seu novo menu de inicialização."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3797,7 +3824,7 @@ msgstr ""
 "opcional, em adição ao GRUB original e Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3808,7 +3835,7 @@ msgstr ""
 "se for utilizado o GRUB padrão."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3817,12 +3844,12 @@ msgstr ""
 "que está disponível na página de resumo durante a instalação."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Usando um Gerenciador de Inicialização existente"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3836,7 +3863,7 @@ msgstr ""
 "Gerenciador de Inicialização."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3847,12 +3874,12 @@ msgstr ""
 "a fase de particionamento anterior, por exemplo: sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3863,7 +3890,7 @@ msgstr ""
 "volta para a tela do instalador."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3879,12 +3906,12 @@ msgstr ""
 "questão."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Opções Avançadas do Gerenciador de Inicialização"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 46d34b7e..4e7ca9f9 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-03-06 23:14+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1127,21 +1127,22 @@ msgstr ""
 "recomandă să fiți prudent în alegeri."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partiționare de disc personalizată cu DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1154,18 +1155,19 @@ msgstr ""
 "putea demara."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Aici configurați compartimentarea discurilor. Puteți crea și înlătura "
 "partiții, schimba sistemul de fișiere al unei partiții, modifica dimensiunea "
 "și chiar vizualiza conținutul ei înainte de a începe."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1174,7 +1176,7 @@ msgstr ""
 "de stocare, precum o cheie USB. De exemplu: sda, sdb și sdc dacă sînt trei."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1183,7 +1185,7 @@ msgstr ""
 "toate partițiile de pe dispozitivul de stocare selectat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1193,15 +1195,36 @@ msgstr ""
 "redimensiona sau chiar șterge."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continuați pînă cînd ajustați totul așa cum doriți."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Apăsați pe <guibutton>Gata</guibutton> cînd sînteți pregătit."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1406,22 +1429,22 @@ msgstr ""
 "megaocteți."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalare cu DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Februarie 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1436,7 +1459,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1447,7 +1470,7 @@ msgstr ""
 "\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1458,7 +1481,7 @@ msgstr ""
 "\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1469,13 +1492,13 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Documentation_team\">echipa de documentație</"
 "link>."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1485,8 +1508,8 @@ msgstr ""
 "de componentele voastre materiale și de alegerile făcute în timpul "
 "instalării."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1670,11 +1693,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1888,8 +1906,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Cu tasta F2 aveți ajutorul tradus în limba aleasă."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3649,11 +3667,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Dacă ați ales <code>Grub 2</code> ca încărcător de sistem, nu puteți utiliza "
 "această unealtă pentru a edita intrările în această etapă, apăsați "
@@ -3661,7 +3680,7 @@ msgstr ""
 "sau să utilizați  <code>grub-customizer</code>."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3672,7 +3691,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3681,7 +3700,7 @@ msgstr ""
 "intrare implicită sînt acțiuni care nu comportă nici un risc."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3689,7 +3708,7 @@ msgstr ""
 "puteți redenumi în întregime."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3698,7 +3717,7 @@ msgstr ""
 "o alegere la pornire."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3715,17 +3734,25 @@ msgstr "Opțiunile principale ale încărcătorului de sistem"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3734,7 +3761,7 @@ msgstr ""
 "aleși automatic de instalator, în acest caz îi puteți schimba aici."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3745,17 +3772,17 @@ msgstr ""
 "existent, ori să lăsați Mageia să creeze unul nou."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Meniurile grafice Mageia sînt frumoase :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Se utilizează un încărcător de sistem Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3768,7 +3795,7 @@ msgstr ""
 "adauge în noul meniu de demaraj."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3777,7 +3804,7 @@ msgstr ""
 "de GRUB (învechit) și Lilo. "
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3788,7 +3815,7 @@ msgstr ""
 "dacă este utilizat încărcătorul de sistem GRUB implicit."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3797,12 +3824,12 @@ msgstr ""
 "care este disponibil în pagina rezumat din cursul instalării."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Se utilizează încărcătorul de sistem existent"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3816,7 +3843,7 @@ msgstr ""
 "încărcătorului de sistem. "
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3828,14 +3855,14 @@ msgstr ""
 "exemplu: sda7)."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3846,7 +3873,7 @@ msgstr ""
 "+Alt+F7 vă readuce în ecranul instalatorului."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3861,12 +3888,12 @@ msgstr ""
 "sistem Mageia. Consultați documentația sistemului de operare în chestiune."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Opțiunile avansate ale încărcătorului de sistem"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 624d8aae..1f389ccc 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-05 14:06+0200\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1165,21 +1165,22 @@ msgstr ""
 "автоматически. Опять же, стоит параметры выбирать очень осторожно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ручное разделение диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1192,11 +1193,12 @@ msgstr ""
 "иначе загрузка системы станет невозможной."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "С помощью этой страницы можно определить компоновки разделов в системе. С ее "
 "помощью можно удалять и создавать разделы, изменять файловые системы на "
@@ -1204,7 +1206,7 @@ msgstr ""
 "внесения изменений."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1214,7 +1216,7 @@ msgstr ""
 "если будет обнаружено три диска."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1223,7 +1225,7 @@ msgstr ""
 "выбранном носителе данных были очищены."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1234,19 +1236,40 @@ msgstr ""
 "разделы."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Повторяйте эти действия для всех соответствующих разделов, пока все не "
 "станет так, как вы хотите."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут "
 "завершены."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1456,22 +1479,22 @@ msgid ""
 msgstr "Также следует создавать разделы только с чётным размером в мегабайтах."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Установка с помощью DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Февраль 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1486,7 +1509,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1498,7 +1521,7 @@ msgstr ""
 "licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1509,7 +1532,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1520,13 +1543,13 @@ msgstr ""
 "Documentation_team\">команды документирования</link>, Если вы хотите, помочь "
 "улучшить данное руководство."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1536,8 +1559,8 @@ msgstr ""
 "страниц, которые вы увидите, зависит от набора оборудования в системе и "
 "выбранного вами варианта установки."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1726,11 +1749,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1953,8 +1971,8 @@ msgstr ""
 "Посмотреть перевод справки на выбранном языке можно с помощью нажатия "
 "клавиши F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3754,11 +3772,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Если вами был выбран загрузчик <code>Grub 2</code>, то вы не сможете "
 "воспользоваться этим инструментом для редактирования записей на следующем "
@@ -3768,7 +3787,7 @@ msgstr ""
 "grub2/custom.cfg</code> вручную."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3779,7 +3798,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3788,7 +3807,7 @@ msgstr ""
 "относится изменение метки записи или обозначение дефолтной записи в списке."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3796,7 +3815,7 @@ msgstr ""
 "название записи."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3805,7 +3824,7 @@ msgstr ""
 "пользователем не будет сделано другого выбора во время показа меню загрузки."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3823,17 +3842,25 @@ msgstr "Основные параметры загрузчика"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3843,7 +3870,7 @@ msgstr ""
 "их с помощью этой страницы."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3854,17 +3881,17 @@ msgstr ""
 "к меню текущего загрузчика, или Mageia должна создать собственный загрузчик."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Графические меню Mageia выглядят великолепно. :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Использование загрузчика Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3877,7 +3904,7 @@ msgstr ""
 "этих операционных систем в новое меню загрузки Mageia."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3886,7 +3913,7 @@ msgstr ""
 "дополнение к устаревшей версии GRUB и Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3897,7 +3924,7 @@ msgstr ""
 "GRUB (устаревшей версии)."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3907,12 +3934,12 @@ msgstr ""
 "операционной системы."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Использование уже установленного загрузчика"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3925,7 +3952,7 @@ msgstr ""
 "сможете изменить место установки загрузчика."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3936,12 +3963,12 @@ msgstr ""
 "шаге распределения диска на разделы, например «sda7»."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Если быть точным, sda - это устройство, а sda7 - раздел на устройстве."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3953,7 +3980,7 @@ msgstr ""
 "помощью нажатия комбинации клавиш Ctrl+Alt+F7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3969,12 +3996,12 @@ msgstr ""
 "другой операционной системы."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Дополнительные параметры загрузчика"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 506a1fc6..3b49c80e 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-01-05 11:47+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/mageia/"
@@ -920,21 +920,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Razdeljevanje diska po meri s programom DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -943,44 +944,65 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1149,22 +1171,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Namestitev s programom DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Februar 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1179,7 +1201,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1187,7 +1209,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1195,28 +1217,28 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
 "while installing."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1373,11 +1395,6 @@ msgid ""
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1564,8 +1581,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3013,14 +3030,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3028,27 +3045,27 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3063,24 +3080,32 @@ msgstr "Glavne možnosti zagonskega nalagalnika"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: 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><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3088,17 +3113,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3107,14 +3132,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: 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><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3122,19 +3147,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 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><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3143,7 +3168,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3151,12 +3176,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3164,7 +3189,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3174,12 +3199,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Napredne možnosti zagonskega nalagalnika"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index 98f13982..8fef3885 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-04-07 22:51+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -1101,21 +1101,22 @@ msgstr ""
 "konservatore në zgjedhjen tuaj."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ndrysho shpërndarjet e diskut me DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1124,29 +1125,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1156,15 +1157,36 @@ msgstr ""
 "montimi, ndrysho atë apo fshij atë."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Vazhdoni derisa ju të keni rregulluar gjithçka për dëshirat tuaja."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kliko<guibutton>e Bërë</guibutton> kur ju jeni gati."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\" /> </imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1359,22 +1381,22 @@ msgstr ""
 "në megabajt."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Instalim me DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr ""
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Shkurt 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1389,7 +1411,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1397,7 +1419,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1408,20 +1430,20 @@ msgstr ""
 "\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
 "link>, if you would like to help improve this manual."
 msgstr ""
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1431,8 +1453,8 @@ msgstr ""
 "manual. Cilat ekrane ju do të shihni, varet nga pjesët-elektronike tuaja dhe "
 "zgjedhjet që bëni gjatë instalimit."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1616,11 +1638,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 #, fuzzy
@@ -1808,8 +1825,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3315,14 +3332,14 @@ msgstr ""
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3333,27 +3350,27 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 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><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3368,24 +3385,32 @@ msgstr "Opsionet kryesore të programit Bootloader"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: 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><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3393,17 +3418,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3412,14 +3437,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: 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><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3427,19 +3452,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 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><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3448,7 +3473,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3456,12 +3481,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr ""
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3469,7 +3494,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3479,12 +3504,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index 8acecbe4..fdfb685a 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-06 13:54+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
@@ -1120,21 +1120,22 @@ msgstr ""
 "gång så är det klokt att vara försiktig med dina val."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Anpassad diskpartionering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-diskdrake.png\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1147,18 +1148,19 @@ msgstr ""
 "ställas in, annars kommer detta göra ditt system omöjligt att boota."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Justera layouten på dina hårddiskar här. Du kan radera eller skapa "
 "partitioner, ändra filsystem för en partition eller dess storlek, och även "
 "titta vad som finns på dem innan du startar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1168,7 +1170,7 @@ msgstr ""
 "stycken."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1177,7 +1179,7 @@ msgstr ""
 "den valda lagringsenheten"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1186,15 +1188,36 @@ msgstr ""
 "filsystem och en monteringspunkt, ändra storlek eller radera den."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Fortsätt tills du har justerat allt enligt dina önskemål."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klicka på <guibutton>Klar</guibutton> när du är redo."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1399,22 +1422,22 @@ msgstr ""
 "Se också till att alla partitioner skapas med ett jämnt antal megabyte."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Installation med DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "februari 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1429,7 +1452,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1440,7 +1463,7 @@ msgstr ""
 "creativecommons.org/licenses/by-sa/3.0/</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1451,7 +1474,7 @@ msgstr ""
 "\">NeoDoc</link>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1461,13 +1484,13 @@ msgstr ""
 "\"https://wiki.mageia.org/en/Documentation_team\">Dokumentations-teamet</"
 "link> om du vill hjälpa till och förbättra den här manualen."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1477,8 +1500,8 @@ msgstr ""
 "handboken. Vilka skärmbilder som just du kommer att se beror på din hårdvara "
 "och vilka val du gör under installationen."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1666,11 +1689,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1884,8 +1902,8 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Hjälpen är översatt i det valda språket med tangenten F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -3628,11 +3646,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Om du har du valt <code>Grub 2</code> som starthanterare så kan du inte "
 "använda det här verktyget för att ändra poster i det här steget. Klicka på "
@@ -3640,7 +3659,7 @@ msgstr ""
 "använda <code>grub-customizer</code>."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3651,7 +3670,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3660,7 +3679,7 @@ msgstr ""
 "markera kryssrutan för att ange den som ska vara standard."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3668,7 +3687,7 @@ msgstr ""
 "helt."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3677,7 +3696,7 @@ msgstr ""
 "uppstart."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3694,17 +3713,25 @@ msgstr "Huvudalternativ för startshanteraren"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3713,7 +3740,7 @@ msgstr ""
 "automatiskt valda av installationen så kan du ändra dessa här."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3724,17 +3751,17 @@ msgstr ""
 "tillåta Mageia att skapa en ny."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageias grafiska menyer är fina :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Använder en startshanterare från Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3746,7 +3773,7 @@ msgstr ""
 "installerat kommer Mageia att försöka lägga till detta i din nya startmeny."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3755,7 +3782,7 @@ msgstr ""
 "GRUB legacy och Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3766,7 +3793,7 @@ msgstr ""
 "används."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3775,12 +3802,12 @@ msgstr ""
 "tillgänglig på översiktssidan under installation."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Använder en befintlig startshanterare"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3793,7 +3820,7 @@ msgstr ""
 "ändra var du vill installera starthanteraren."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3804,13 +3831,13 @@ msgstr ""
 "tidigare, t. ex. sda7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3821,7 +3848,7 @@ msgstr ""
 "tar dig tillbaka till installationen."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3835,12 +3862,12 @@ msgstr ""
 "till det automatiskt. Se dokumentationen för operativsystemet i fråga."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Avancerat alternativ för starthanteraren"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index 5b1b1916..71885c74 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-04 23:59+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -163,8 +163,8 @@ msgid ""
 msgstr ""
 "32 bit paketleri de içeren bir 64 bit kurulumunu güncellemek istiyorsanız, "
 "buradaki ağ protokollerinden birine tıklayarak çevrimiçi bir yansıyı eklemek "
-"üzere bu ekranı kullanmanız önerilir. 64 bit DVD iso sadece 64 bit ve "
-"noarch paketlerini içerdiğinden 32 bit paketleri güncelleyemecektir. Ancak, "
+"üzere bu ekranı kullanmanız önerilir. 64 bit DVD iso sadece 64 bit ve noarch "
+"paketlerini içerdiğinden 32 bit paketleri güncelleyemecektir. Ancak, "
 "çevrimiçi bir yansı ekledikten sonra kurulum aracı gereken 32 bit paketleri "
 "bulabilir."
 
@@ -1123,21 +1123,22 @@ msgstr ""
 "akıllıca olur."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "DiskDrake ile kişisel disk bölümlendirme"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1150,11 +1151,12 @@ msgstr ""
 "işaretli OLMAMALIDIR; yoksa sisteminiz açılmayacaktır."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "Disk yerleşim düzenini burada ayarlayın. Disk bölümleri oluşturabilir veya "
 "kaldırabilir, bir disk bölümünün dosya sistemini veya boyutunu "
@@ -1162,7 +1164,7 @@ msgstr ""
 "görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1171,7 +1173,7 @@ msgstr ""
 "sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1180,7 +1182,7 @@ msgstr ""
 "Temizle</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1190,15 +1192,36 @@ msgstr ""
 "boyutlandırın veya silin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "İsteğiniz doğrultusunda her şeyi ayarlayana kadar devan edin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Hazır olunca <guibutton>Bitti</guibutton>' yi tıklayın."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1230,8 +1253,8 @@ msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:45
@@ -1321,8 +1344,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:96
@@ -1403,22 +1426,22 @@ msgstr ""
 "olun."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "DrakX ile kurulum"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Şubat 2014"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1433,7 +1456,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1444,7 +1467,7 @@ msgstr ""
 "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1455,7 +1478,7 @@ msgstr ""
 "CMS</link> yardımıyla hazırlanmıştır."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1466,13 +1489,13 @@ msgstr ""
 "wiki.mageia.org/en/Documentation_team\">Belgelendirme Ekibi</link> ile "
 "irtibat kurun."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1482,8 +1505,8 @@ msgstr ""
 "Göreceğiniz ekranlar donanımınıza ve kurulum sırasındaki seçimlerinize "
 "bağlıdır."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1671,19 +1694,14 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:54
@@ -1734,8 +1752,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:91
@@ -1749,8 +1767,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:102
@@ -1833,8 +1851,8 @@ msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:140
@@ -1890,16 +1908,17 @@ msgstr ""
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Yardım, F2 tuşu ile seçilen dile çevrilmiştir."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 "Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi "
-"için: <link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_option"
-"s\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+"için: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:180
@@ -3642,11 +3661,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Eğer önyükleyici olarak <code>Grub 2</code>'yi seçerseniz 'İleri' aşamasında "
 "girdileri düzenlemek için bu aracı kullanamazsınız. <code>/boot/grub2/custom."
@@ -3654,7 +3674,7 @@ msgstr ""
 "code> kullanmanız gerekiyor."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3665,7 +3685,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3674,7 +3694,7 @@ msgstr ""
 "ve girdiyi yanındaki kutucuğu işaretleyerek öntanımlı olarak belirlemektir."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3682,7 +3702,7 @@ msgstr ""
 "adlandırabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3691,7 +3711,7 @@ msgstr ""
 "önyükleme yapacağı girdidir."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3709,17 +3729,25 @@ msgstr "Önyükleyici ana seçenekleri"
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3728,7 +3756,7 @@ msgstr ""
 "ayarları tercih ediyorsanız burada değiştirebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3739,17 +3767,17 @@ msgstr ""
 "önyükleyici oluşturmasına izin vermek arasında tercih yapmalısınız."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Mageia grafik menüleri güzeldir :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Bir Mageia önyükleyicisi kullanmak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3762,7 +3790,7 @@ msgstr ""
 "eklemeyi dener."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3771,7 +3799,7 @@ msgstr ""
 "olarak sunmaktadır."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3782,7 +3810,7 @@ msgstr ""
 "algılanmayacaklardır."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3791,12 +3819,12 @@ msgstr ""
 "GRUB2 önyükleyiciyi kullanmak olacaktır."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Mevcut bir önyükleyiciyi kullanmak"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3808,7 +3836,7 @@ msgstr ""
 "Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine basmalısınız."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3819,14 +3847,14 @@ msgstr ""
 "seçmelisiniz."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 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><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3837,7 +3865,7 @@ msgstr ""
 "Ctrl+Alt+F7 sizi kurulum ekranına döndürür."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3852,12 +3880,12 @@ msgstr ""
 "bakın."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Önyükleyici gelişmiş seçenekleri"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 97b2fe65..334b527a 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: 2015-05-04 12:41+0300\n"
+"POT-Creation-Date: 2015-05-23 08:50+0300\n"
 "PO-Revision-Date: 2015-05-04 12:57+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -100,9 +100,9 @@ msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Вибір носія (налаштовування додаткових носіїв пакунків для встановлення)"
 
-#.  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 ""
@@ -163,32 +163,32 @@ msgid ""
 "packages. However, after adding an online mirror, installer will find the "
 "needed 32 bit packages there."
 msgstr ""
-"Якщо ви оновлюєте 64-бітову версію системи, де можуть міститися якісь "
-"32-бітові пакунки, вам варто скористатися цією сторінкою для додавання "
-"сховища пакунків: позначте один із протоколів мережі. DVD із 64-бітовою "
-"версією містить лише 64-бітові пакунки та пакунки без визначеної архітектури. "
-"За його допомогою не можна оновити 32-бітові пакунки. Втім, після додавання "
-"інтернет-сховища, засіб встановлення може виявити потрібні для оновлення "
-"32-бітові пакунки."
+"Якщо ви оновлюєте 64-бітову версію системи, де можуть міститися якісь 32-"
+"бітові пакунки, вам варто скористатися цією сторінкою для додавання сховища "
+"пакунків: позначте один із протоколів мережі. DVD із 64-бітовою версією "
+"містить лише 64-бітові пакунки та пакунки без визначеної архітектури. За "
+"його допомогою не можна оновити 32-бітові пакунки. Втім, після додавання "
+"інтернет-сховища, засіб встановлення може виявити потрібні для оновлення 32-"
+"бітові пакунки."
 
 #. type: Content of: <section><info><title>
 #: en/addUser.xml:4
 msgid "User and Superuser Management"
 msgstr "Керування обліковими записами користувача і адміністратора"
 
-#.  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
-#.  marja 2013-04-26 added new note
+#.        "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:27
 msgid ""
@@ -439,17 +439,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Виберіть точки монтування"
 
-#.  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 ""
@@ -715,8 +715,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Налаштування ваших служб"
 
-#.  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 ""
@@ -769,8 +769,8 @@ msgstr "Вносьте зміни, лише якщо вам добре відо�
 msgid "Configure your Timezone"
 msgstr "Налаштування часового поясу"
 
-#.  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:20
 msgid ""
@@ -1159,21 +1159,22 @@ msgstr ""
 "автоматично. Знову ж таки, варто параметри варто вибирати дуже обережно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:19
+#: en/diskdrake.xml:20
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Нетиповий поділ диска на розділи за допомогою DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:26
+#: en/diskdrake.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
 "imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:33
+#: en/diskdrake.xml:31
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1186,11 +1187,12 @@ msgstr ""
 "завантаження системи стане неможливим."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:39
+#: en/diskdrake.xml:38
+#, fuzzy
 msgid ""
-"Adjust the layout of your disk(s) here. You can remove or create partitions, "
-"change the filesystem of a partition or change its size and even view what "
-"is in them before you start."
+"Adjust the layout of your disk(s)  here. You can remove or create "
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
 msgstr ""
 "За допомогою цієї сторінки можна визначити компонування розділів у вашій "
 "системі. За її допомогою можна вилучати і створювати розділи, змінювати "
@@ -1198,7 +1200,7 @@ msgstr ""
 "розділів до внесення змін."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:42
+#: en/diskdrake.xml:43
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1208,7 +1210,7 @@ msgstr ""
 "виявлено три диски."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:47
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1217,7 +1219,7 @@ msgstr ""
 "вибраному носії даних було вилучено."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:47
+#: en/diskdrake.xml:50
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
@@ -1227,19 +1229,40 @@ msgstr ""
 "точку монтування, розміри чи просто витріть увесь розділ."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:49
+#: en/diskdrake.xml:54
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Повторюйте ці дії для всіх відповідних розділів, аж доки все не набуде "
 "потрібних вам обрисів."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:51
+#: en/diskdrake.xml:57
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Натисніть кнопку <guibutton>Виконано</guibutton>, коли налаштовування буде "
 "завершено."
 
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:61
+msgid ""
+"If you are installing Mageia on an UEFI system, check that an ESP (EFI "
+"System Partition) is present and correctly mounted on /boot/EFI (see above)"
+msgstr ""
+
+#. type: Content of: <section><note><para><mediaobject>
+#: en/diskdrake.xml:66
+#, fuzzy
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+
+#. type: Content of: <section><figure>
+#: en/diskdrake.xml:65 en/installer.xml:41
+msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
+
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:25
 msgid "Partitioning"
@@ -1450,22 +1473,22 @@ msgstr ""
 "мегабайтах."
 
 #. type: Content of: <article><info><title>
-#: en/DrakX-cover.xml:4 en/DrakX-cover.xml:28 en/DrakX.xml:3
+#: en/DrakX-cover.xml:4 en/DrakX.xml:3
 msgid "Installation with DrakX"
 msgstr "Встановлення за допомогою DrakX"
 
-#. type: Content of: <book><info><cover><info>
-#: en/DrakX-cover.xml:5 en/DrakX-cover.xml:29
+#. type: Content of: <book><info>
+#: en/DrakX-cover.xml:5
 msgid "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><date>
-#: en/DrakX-cover.xml:10 en/DrakX-cover.xml:34
+#. type: Content of: <book><info><revhistory><revision><date>
+#: en/DrakX-cover.xml:10
 msgid "February 2014"
 msgstr "Лютий 2014 року"
 
-#. type: Content of: <book><info><cover><info><revhistory><revision><revremark>
-#: en/DrakX-cover.xml:11 en/DrakX-cover.xml:35
+#. type: Content of: <book><info><revhistory><revision><revremark>
+#: en/DrakX-cover.xml:11
 msgid "Mageia 4"
 msgstr "Mageia 4"
 
@@ -1480,7 +1503,7 @@ msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:21 en/DrakX-cover.xml:54 en/DrakX.xml:12
+#: en/DrakX-cover.xml:21 en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
 "3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
@@ -1491,7 +1514,7 @@ msgstr ""
 "licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>ю"
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:24 en/DrakX-cover.xml:58 en/DrakX.xml:16
+#: en/DrakX-cover.xml:24 en/DrakX.xml:16
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1502,7 +1525,7 @@ msgstr ""
 "neodoc.biz\">NeoDoc</link>."
 
 #. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:26 en/DrakX-cover.xml:60 en/DrakX.xml:18
+#: en/DrakX-cover.xml:26 en/DrakX.xml:18
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1513,13 +1536,13 @@ msgstr ""
 "mageia.org/en/Documentation_team\">команди документування</link>, якщо "
 "хочете допомогти у покращенні цього підручника."
 
-#. type: Content of: <article><info><cover><para><note>
-#: en/DrakX-cover.xml:48 en/DrakX.xml:6
+#. type: Content of: <section><para><note>
+#: en/DrakX-cover.xml:36 en/DrakX.xml:6 en/setupBootloader.xml:16
 msgid "<note>"
 msgstr "<note>"
 
 #. type: Content of: <article><info><cover><para><note><para>
-#: en/DrakX-cover.xml:49 en/DrakX.xml:7
+#: en/DrakX-cover.xml:37 en/DrakX.xml:7
 msgid ""
 "No one will see all the installer screens that you see in this manual. Which "
 "screens you will see, depends on your hardware and the choices you make "
@@ -1529,8 +1552,8 @@ msgstr ""
 "сторінок, які ви побачите залежить від набору обладнання у вашій системі та "
 "вибраного вами варіанта встановлення."
 
-#. type: Content of: <article><info><cover><para>
-#: en/DrakX-cover.xml:52 en/DrakX.xml:10
+#. type: Content of: <section><para>
+#: en/DrakX-cover.xml:40 en/DrakX.xml:10 en/setupBootloader.xml:20
 msgid "</note>"
 msgstr "</note>"
 
@@ -1539,9 +1562,9 @@ msgstr "</note>"
 msgid "Congratulations"
 msgstr "Вітаємо"
 
-#.  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
@@ -1602,10 +1625,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Форматування"
 
-#.  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 ""
@@ -1719,11 +1742,6 @@ msgstr ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:41
-msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
-
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
 msgid ""
@@ -1810,9 +1828,9 @@ msgid ""
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
-"Додати параметри роботи ядра можна натисканням клавіші <emphasis "
-"role=\"bold\">F6</emphasis> у режимі застарілої системи або клавіші <emphasis "
-"role=\"bold\">E</emphasis> у режимі UEFI."
+"Додати параметри роботи ядра можна натисканням клавіші <emphasis role=\"bold"
+"\">F6</emphasis> у режимі застарілої системи або клавіші <emphasis role="
+"\"bold\">E</emphasis> у режимі UEFI."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:104
@@ -1947,17 +1965,16 @@ msgstr ""
 "Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
 "клавіші F2."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:175
+#. type: Content of: <section><para>
+#: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 "Докладніший опис параметрів ядра у застарілих системах та системах з UEFI "
-"можна знайти <link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_"
-"options"
-"\">тут</link>."
+"можна знайти <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">тут</link>."
 
 #. type: Content of: <section><para>
 #: en/installer.xml:180
@@ -2157,10 +2174,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Поновлення"
 
-#.  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 ""
@@ -2204,9 +2221,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Вибір носія (з пакунками, які не є вільними)"
 
-#.  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
@@ -2329,18 +2346,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Резюме щодо інших параметрів"
 
-#.  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
@@ -2689,8 +2706,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Рівень безпеки"
 
-#.  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 ""
@@ -3335,8 +3352,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Вибір країни і регіону"
 
-#.  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 ""
@@ -3678,10 +3695,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Вибір драйвера миші"
 
-#.  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 ""
@@ -3748,11 +3765,12 @@ msgstr ""
 
 #. type: Content of: <section><note><para>
 #: en/setupBootloaderAddEntry.xml:18
+#, fuzzy
 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 "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead."
+"If you have chosen <code>Grub 2</code> as your bootloader, or Grub2-efi for "
+"UEFI systems, you cannot use this tool to edit entries at this step, press "
+"'Next'. You need to manually edit <code>/boot/grub2/custom.cfg</code> or use "
+"<code>grub-customizer</code> instead."
 msgstr ""
 "Якщо вами було вибрано завантажувач <code>Grub 2</code>, ви не зможете "
 "скористатися цим інструментом для редагування записів на наступному кроці, "
@@ -3762,7 +3780,7 @@ msgstr ""
 "вручну."
 
 #. type: Content of: <section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:25
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
@@ -3773,7 +3791,7 @@ msgstr ""
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:31
 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."
@@ -3782,7 +3800,7 @@ msgstr ""
 "мітки запису або позначення типового запису у списку."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:33
+#: en/setupBootloaderAddEntry.xml:34
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -3790,7 +3808,7 @@ msgstr ""
 "запису."
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:36
+#: en/setupBootloaderAddEntry.xml:37
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -3799,7 +3817,7 @@ msgstr ""
 "користувачем не буде зроблено іншого вибору під час показу меню завантаження."
 
 #. type: Content of: <section><warning><para>
-#: en/setupBootloaderAddEntry.xml:40
+#: en/setupBootloaderAddEntry.xml:41
 msgid ""
 "Editing other things can leave you with an unbootable system. Please don't "
 "just try something without knowing what you are doing."
@@ -3813,21 +3831,29 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Основні параметри завантажувача"
 
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. 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\" /> </"
+"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>"
 
+#. type: Content of: <section><para><note><para>
+#: en/setupBootloader.xml:17
+msgid ""
+"With an UEFI system, the user interface is slightly different as you cannot "
+"choose the boot loader (first drop down list) since only one is available"
+msgstr ""
+
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:16
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -3837,7 +3863,7 @@ msgstr ""
 "за допомогою цієї сторінки."
 
 #. type: Content of: <section><para>
-#: en/setupBootloader.xml:20
+#: 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 "
@@ -3848,17 +3874,17 @@ msgstr ""
 "до меню поточного завантажувача, чи Mageia має створити власний завантажувач."
 
 #. type: Content of: <section><tip><para>
-#: en/setupBootloader.xml:26
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :)"
 msgstr "Графічні меню Mageia виглядає чудово. :)"
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:32
+#: en/setupBootloader.xml:38
 msgid "Using a Mageia bootloader"
 msgstr "Користування завантажувачем Mageia"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:36
+#: en/setupBootloader.xml:42
 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 "
@@ -3871,7 +3897,7 @@ msgstr ""
 "цих операційних систем до нового меню завантаження Mageia."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:41
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -3880,7 +3906,7 @@ msgstr ""
 "до застарілої версії GRUB та Lilo."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:45
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy) and will not be recognised if the default GRUB bootloader is "
@@ -3891,7 +3917,7 @@ msgstr ""
 "GRUB (застарілої версії)."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloader.xml:49
+#: en/setupBootloader.xml:55
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -3901,12 +3927,12 @@ msgstr ""
 "«Резюме» під час встановлення операційної системи."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:56
+#: en/setupBootloader.xml:62
 msgid "Using an existing bootloader"
 msgstr "Користування вже встановленим завантажувачем"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:60
+#: en/setupBootloader.xml:66
 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 "
@@ -3919,7 +3945,7 @@ msgstr ""
 "ви зможете змінити місце встановлення завантажувача."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:66
+#: en/setupBootloader.xml:72
 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 "
@@ -3930,12 +3956,12 @@ msgstr ""
 "кроку розподілу диска на розділи, наприклад «sda7»."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:77
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Якщо бути точним, sda — це пристрій, а sda7 — розділ на пристрої."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:75
+#: en/setupBootloader.xml:81
 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 "
@@ -3947,7 +3973,7 @@ msgstr ""
 "встановлення можна за допомогою натискання комбінації клавіш Ctrl+Alt+F7."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:81
+#: en/setupBootloader.xml:87
 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 "
@@ -3963,12 +3989,12 @@ msgstr ""
 "до іншої операційної системи."
 
 #. type: Content of: <section><section><info><title>
-#: en/setupBootloader.xml:91
+#: en/setupBootloader.xml:97
 msgid "Bootloader advanced option"
 msgstr "Додаткові параметри завантажувача"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:95
+#: en/setupBootloader.xml:101
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -3985,14 +4011,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Налаштування SCSI"
 
-#.  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 ""
@@ -4034,7 +4060,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Налаштування звуку"
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4113,12 +4139,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Підтвердження форматування жорсткого диска"
 
-#.  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 ""