Update translation catalog

1 files changed, 137 insertions, 93 deletions

diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 795049c0..151e45b9 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-02-10 16:29+0200\n"
+"POT-Creation-Date: 2016-07-17 11:22+0300\n"
 "PO-Revision-Date: 2016-02-10 16:36+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -601,22 +601,22 @@ msgstr ""
 "налаштування годинника."
 
 #. type: Content of: <section><info><title>
-#: en/bootLive.xml:3
+#: en/bootLive.xml:1
 msgid "Boot Mageia as Live system"
 msgstr "Завантаження Mageia як портативної системи"
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:8
+#: en/bootLive.xml:1
 msgid "Booting the medium"
 msgstr "Завантаження системи з носія"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:13
+#: en/bootLive.xml:1
 msgid "From a disc"
 msgstr "З диска"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:16
+#: en/bootLive.xml:1
 msgid ""
 "You can boot directly from the media you used to burn your image (CD-ROM, "
 "DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
@@ -635,7 +635,7 @@ msgstr ""
 "завантаження системи на комп’ютері."
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:23
+#: en/bootLive.xml:6
 msgid ""
 "According to which hardware you have, and how it is configured, you get "
 "either one or another of the two screens below."
@@ -645,12 +645,12 @@ msgstr ""
 "на екрані."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/bootLive.xml:29
+#: en/bootLive.xml:7
 msgid "From a USB device"
 msgstr "З пристрою USB"
 
 #. type: Content of: <section><section><section><para>
-#: en/bootLive.xml:32
+#: en/bootLive.xml:7
 msgid ""
 "You can boot from the USB device on which you dumped your image ISO. "
 "According to your BIOS settings, the computer boots perhaps directly on the "
@@ -666,27 +666,28 @@ msgstr ""
 "вибрати периферійний пристрій, з якого завантажуватиметься комп’ютер."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:43
+#: en/bootLive.xml:12
 msgid "In BIOS/CSM/Legacy mode"
 msgstr "У застарілому режимі BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:47
-msgid "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+#: en/bootLive.xml:12
+#, fuzzy
+msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:52
+#: en/bootLive.xml:12
 msgid "First screen while booting in BIOS mode"
 msgstr "Перший екран завантаження у режимі BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:56
+#: en/bootLive.xml:12
 msgid "In the middle menu, you have the choice between three actions:"
 msgstr "За допомогою середнього меню ви можете вибрати одну з трьох дій:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:61
+#: en/bootLive.xml:13
 msgid ""
 "Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
 "or USB stick) without writing anything on the disk, so expect a very slow "
@@ -700,7 +701,7 @@ msgstr ""
 "або просто ознайомитися із нею."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:68
+#: en/bootLive.xml:16
 msgid ""
 "Install Mageia: This choice will directly install Mageia on a hard disk."
 msgstr ""
@@ -708,7 +709,7 @@ msgstr ""
 "встановлення Mageia на жорсткий диск."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:73
+#: en/bootLive.xml:17
 msgid ""
 "Boot from hard disk: This choice allows to boot from hard disk, as usual, "
 "when no media (CD/DVD or USB stick) is connected. (not working with Mageia "
@@ -720,31 +721,31 @@ msgstr ""
 "працює у Mageia 5)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:79
+#: en/bootLive.xml:19
 msgid "In the bottom menu, are the Boot Options:"
 msgstr ""
 "За допомогою нижнього меню можна отримати доступ до параметрів завантаження:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:83
+#: en/bootLive.xml:19
 msgid ""
 "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr "F1 — Довідка. Опис параметрі «splash», «apm», «acpi» та «Ide»"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:88
+#: en/bootLive.xml:20
 msgid "F2 - Language. Choose the display language of the screens."
 msgstr "F2 — Мова. Вибір мови інтерфейсу."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:93
+#: en/bootLive.xml:21
 msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 — Роздільна здатність. Тут можна вибрати один із таких варіантів: text, "
 "640x400, 800x600, 1024x728"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:98
+#: en/bootLive.xml:22
 msgid ""
 "F4 - CD-Rom. CD-Rom or Other. Normally, the installation is performed from "
 "the inserted installation medium. Here, select other sources, like FTP or "
@@ -759,7 +760,7 @@ msgstr ""
 "цього пункту можна вибрати одне із джерел пакунків на сервері."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:106
+#: en/bootLive.xml:26
 msgid ""
 "F5 - Driver. Yes or No. The system is aware about the presence of an "
 "optional disk with a driver update and will require its insertion during "
@@ -770,7 +771,7 @@ msgstr ""
 "наказати їй попросити його вставити під час встановлення."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
-#: en/bootLive.xml:112
+#: en/bootLive.xml:28
 msgid ""
 "F6 - Kernel options. This is a way to specify options according to your "
 "hardware and the drivers to use."
@@ -779,26 +780,27 @@ msgstr ""
 "відповідні до апаратної частини, і драйвери, якими слід скористатися."
 
 #. type: Content of: <section><section><info><title>
-#: en/bootLive.xml:120
+#: en/bootLive.xml:29
 msgid "In UEFI mode"
 msgstr "У режимі UEFI"
 
 #. type: Content of: <section><section><mediaobject>
-#: en/bootLive.xml:124
+#: en/bootLive.xml:29
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
 "bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
-#: en/bootLive.xml:129
+#: en/bootLive.xml:29
 msgid "First screen while booting on UEFI system from disk"
 msgstr "Перший екран під час завантаження системи UEFI з диска"
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:133
+#: en/bootLive.xml:29
 msgid ""
 "You have only the choice to run Mageia in Live mode (first choice)  or to "
 "process the installation (second choice)."
@@ -808,7 +810,7 @@ msgstr ""
 "варіант)."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:135
+#: en/bootLive.xml:30
 msgid ""
 "If you booted from a USB stick, you get two supplemental lines which are a "
 "duplicata of the previous lines suffixed with \"USB\". You have to choose "
@@ -819,7 +821,7 @@ msgstr ""
 "один із цих рядків."
 
 #. type: Content of: <section><section><para>
-#: en/bootLive.xml:139
+#: en/bootLive.xml:32
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
 "and keyboard, then the processes differ, with <link linkend=\"testing"
@@ -2599,31 +2601,32 @@ msgstr ""
 "продовжити роботу з програмою."
 
 #. type: Content of: <section><info><title>
-#: en/login.xml:3
+#: en/login.xml:1
 msgid "Login screen"
 msgstr "Вікно вітання"
 
 #. type: Content of: <section><mediaobject>
-#: en/login.xml:7
+#: en/login.xml:1
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
-#: en/login.xml:12
+#: en/login.xml:1
 msgid "KDM login screen"
 msgstr "Вікно вітання KDM"
 
 #. type: Content of: <section><para>
-#: en/login.xml:16
+#: en/login.xml:1
 msgid "Finally, you will come to the login screen."
 msgstr "Нарешті, вам буде показано вікно вітання."
 
 #. type: Content of: <section><para>
-#: en/login.xml:18
+#: en/login.xml:1
 msgid ""
 "Enter your user name and user password, and in a few seconds you will find "
 "yourself with a loaded KDE or GNOME desktop, depending on which live medium "
@@ -2635,10 +2638,11 @@ msgstr ""
 "користуватися встановленою Mageia, як вам заманеться."
 
 #. type: Content of: <section><para>
-#: en/login.xml:22
+#: en/login.xml:3
+#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link linkend=\"https://"
-"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link xmlns:ns0=\"http://"
+"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
 msgstr ""
 "Іншу частину документації можна знайти у <link linkend=\"https://wiki.mageia."
 "org/en/Category:Documentation\">вікі Mageia</link>."
@@ -4362,22 +4366,26 @@ msgstr "Додавання пункту меню завантаження та �
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
+#: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
 msgid "With a Bios system"
 msgstr "Із системою BIOS"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:18
+#: en/setupBootloaderAddEntry.xml:21
 msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
@@ -4388,7 +4396,7 @@ msgstr ""
 "відповідь буде показано вікно редагування."
 
 #. type: Content of: <section><section><note><para>
-#: en/setupBootloaderAddEntry.xml:23
+#: en/setupBootloaderAddEntry.xml:26
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
@@ -4403,18 +4411,19 @@ msgstr ""
 "вручну."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:30
+#: en/setupBootloaderAddEntry.xml:33
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
 "png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:35
+#: en/setupBootloaderAddEntry.xml:38
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
@@ -4423,7 +4432,7 @@ msgstr ""
 "мітки запису або позначення типового запису у списку."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:39
+#: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
 msgstr ""
@@ -4431,7 +4440,7 @@ msgstr ""
 "запису."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:42
+#: en/setupBootloaderAddEntry.xml:45
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
@@ -4440,7 +4449,7 @@ msgstr ""
 "користувачем не буде зроблено іншого вибору під час показу меню завантаження."
 
 #. type: Content of: <section><section><warning><para>
-#: en/setupBootloaderAddEntry.xml:46
+#: en/setupBootloaderAddEntry.xml:49
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4450,12 +4459,12 @@ msgstr ""
 "достеменно невідоме їхнє призначення."
 
 #. type: Content of: <section><section><title>
-#: en/setupBootloaderAddEntry.xml:53 en/setupBootloader.xml:109
+#: en/setupBootloaderAddEntry.xml:56 en/setupBootloader.xml:112
 msgid "With an UEFI system"
 msgstr "Із системою UEFI"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:55
+#: en/setupBootloaderAddEntry.xml:58
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
 "entries at this step. To do that you need to manually edit <code>/boot/grub2/"
@@ -4469,7 +4478,7 @@ msgstr ""
 "цьому кроці, вибрати типовий запис зі спадного списку."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloaderAddEntry.xml:61
+#: en/setupBootloaderAddEntry.xml:64
 msgid ""
 "After a click on the <guibutton>Next</guibutton> button, another drop down "
 "list allows to choose the video resolution for Grub2 which is a graphical "
@@ -4480,7 +4489,7 @@ msgstr ""
 "завантажувача системи."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloaderAddEntry.xml:66
+#: en/setupBootloaderAddEntry.xml:69
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
@@ -4495,17 +4504,22 @@ msgstr "Основні параметри завантажувача"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
-"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:19
+#: en/setupBootloader.xml:22
 msgid ""
 "If you prefer different bootloader settings to those chosen automatically by "
 "the installer, you can change them here."
@@ -4515,7 +4529,7 @@ msgstr ""
 "за допомогою цієї сторінки."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:23
+#: en/setupBootloader.xml:26
 msgid ""
 "You may already have another operating system on your machine, in which case "
 "you need to decide whether to add Mageia to your existing bootloader, or "
@@ -4526,17 +4540,17 @@ msgstr ""
 "до меню поточного завантажувача, чи Mageia має створити власний завантажувач."
 
 #. type: Content of: <section><section><tip><para>
-#: en/setupBootloader.xml:29
+#: en/setupBootloader.xml:32
 msgid "The Mageia graphical menus are nice :"
 msgstr "Графічні меню Mageia виглядає чудово. :)"
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:34
+#: en/setupBootloader.xml:37
 msgid "Using a Mageia bootloader"
 msgstr "Користування завантажувачем Mageia"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:38
+#: en/setupBootloader.xml:41
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
 "(Master Boot Record)  of your first hard drive. If you already have other "
@@ -4549,7 +4563,7 @@ msgstr ""
 "цих операційних систем до нового меню завантаження Mageia."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:44
+#: en/setupBootloader.xml:47
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
@@ -4558,7 +4572,7 @@ msgstr ""
 "до застарілої версії GRUB та Lilo."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:48
+#: en/setupBootloader.xml:51
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
@@ -4569,7 +4583,7 @@ msgstr ""
 "GRUB (застарілої версії)."
 
 #. type: Content of: <section><section><section><warning><para>
-#: en/setupBootloader.xml:53
+#: en/setupBootloader.xml:56
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
@@ -4579,12 +4593,12 @@ msgstr ""
 "«Резюме» під час встановлення операційної системи."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:61
+#: en/setupBootloader.xml:64
 msgid "Using an existing bootloader"
 msgstr "Користування вже встановленим завантажувачем"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:65
+#: en/setupBootloader.xml:68
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
 "to STOP at the summary page during the installation and click the Bootloader "
@@ -4597,7 +4611,7 @@ msgstr ""
 "ви зможете змінити місце встановлення завантажувача."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:71
+#: en/setupBootloader.xml:74
 msgid ""
 "Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
 "You must select the root partition that you chose during the partitioning "
@@ -4608,12 +4622,12 @@ msgstr ""
 "кроку розподілу диска на розділи, наприклад «sda7»."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:76
+#: en/setupBootloader.xml:79
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
 msgstr "Якщо бути точним, sda — це пристрій, а sda7 — розділ на пристрої."
 
 #. type: Content of: <section><section><section><tip><para>
-#: en/setupBootloader.xml:80
+#: en/setupBootloader.xml:83
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
 "your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
@@ -4625,7 +4639,7 @@ msgstr ""
 "встановлення можна за допомогою натискання комбінації клавіш Ctrl+Alt+F7."
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:86
+#: en/setupBootloader.xml:89
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
@@ -4641,12 +4655,12 @@ msgstr ""
 "до іншої операційної системи."
 
 #. type: Content of: <section><section><section><info><title>
-#: en/setupBootloader.xml:96
+#: en/setupBootloader.xml:99
 msgid "Bootloader advanced option"
 msgstr "Додаткові параметри завантажувача"
 
 #. type: Content of: <section><section><section><para>
-#: en/setupBootloader.xml:100
+#: en/setupBootloader.xml:103
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
 "that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
@@ -4659,7 +4673,7 @@ msgstr ""
 "кожному перезавантаженні</guilabel>. Це допоможе зекономити трохи місця."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:111
+#: en/setupBootloader.xml:114
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
@@ -4669,16 +4683,20 @@ msgstr ""
 "буде лише grub2-efi."
 
 #. type: Content of: <section><section><mediaobject>
-#: en/setupBootloader.xml:115
+#: en/setupBootloader.xml:118
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:120
+#: en/setupBootloader.xml:126
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
 "created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
@@ -4698,7 +4716,7 @@ msgstr ""
 "кількості встановлених вами операційних систем."
 
 #. type: Content of: <section><section><para>
-#: en/setupBootloader.xml:128
+#: en/setupBootloader.xml:134
 msgid "Don't modify the \"Boot Device\" unless really knowing what you do."
 msgstr ""
 "Не змінюйте значення параметри «Пристрій завантаження», якщо у цьому немає "
@@ -5107,9 +5125,10 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
 "</imageobject>"
@@ -5125,6 +5144,31 @@ msgstr ""
 "бачитимете порожній екран. Це нормально."
 
 #~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+#~ "bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+#~ "\"bootloaderConfiguration-im1\"/> </imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+#~ "setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setRootPassword.png"
 #~ "\" format=\"PNG\" align=\"center\" xml:id=\"setRootPassword-im1\"></"
 #~ "imagedata> </imageobject>"