Update translations

17 files changed, 4340 insertions, 2604 deletions

diff --git a/docs/mcc-help/ca.po b/docs/mcc-help/ca.po
index 75d467a4..26478483 100644
--- a/docs/mcc-help/ca.po
+++ b/docs/mcc-help/ca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2016-01-19 11:25+0000\n"
 "Last-Translator: davidochobits <davidochobits@openmailbox.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -845,7 +845,95 @@ msgstr ""
 "xarxa el convida a fer-ho i li dóna informació al respecte."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Activa l'entrada automàtica per entrar automàticament"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Podeu iniciar aquesta eina des de la línia d'ordres, escrivint <emphasis "
+"role=\"bold\">drakauth</emphasis> com a root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Aquesta eina<placeholder type=\"footnote\" id=\"0\"/> li permet connectar-se "
+"al mateix usuari, si el seu entorn / escriptori, sense demanar cap "
+"contrasenya. Es diu autoconnexió. Això és generalment una bona idea quan "
+"només hi ha un usuari que utilitzi la màquina. "
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Es troba sota la pestanya <emphasis role=\"bold\">Arrencada</emphasis> al "
+"centre de control de Mageia amb l'etiqueta \"Configuració d'inici de sessió "
+"automàtic per iniciar sessió automàticament\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Els botons de la interfície són bastant òbvies:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Marqueu <guibutton>Inicia l'entorn gràfic quan el sistema s'inicia</"
+"guibutton>, si voleu que el sistema X Windows s'executi després de "
+"reiniciar. Si no és així, el sistema s'iniciarà en mode text. No obstant "
+"això, serà possible iniciar la interfície gràfica manualment. Això es pot "
+"fer amb el llançament de 'startx' o 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la primera casella està activada, les dues opcions estaran disponibles, "
+"marqueu qualsevol <guibutton>No, no vull autoconnexió</guibutton>, si voleu "
+"que el sistema per continuar ha de preguntar a l'usuari per connectar (i la "
+"contrasenya) o seleccionar <guibutton>Sí, vull autoconnexió amb aquest "
+"(usuari, escriptori)</guibutton>, si cal. En aquest cas, també és necessari "
+"per proveir el <guibutton>nom per defecte</guibutton> i "
+"l'<guibutton>escriptori per defecte</guibutton>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configura el sistema d'arrencada"
 
@@ -855,20 +943,20 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr ""
 
@@ -882,9 +970,10 @@ msgstr ""
 "role=\"bold\">drakboot --boot</emphasis> com a root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -893,16 +982,17 @@ msgstr ""
 "contrasenya, l'arrencada per defecte, etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Es troba sota l'etiqueta d'arrancada al centre de control de Mageia amb el "
 "nom \"Estableix el sistema d'arrancada\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -911,15 +1001,16 @@ msgstr ""
 "modificació d'alguns ajusts poden evitar que el vostre equip s'iniciï de nou!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "En la primera part, anomenada <guilabel>Gestor d'arrancada</guilabel>, es "
 "pot triar el <guibutton>Gestor d'arrancada que es vol utilitzar</guibutton>, "
@@ -930,12 +1021,21 @@ msgstr ""
 "qualsevol modificació pot evitar que la màquina arrenqui."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "A la segona part, anomenada <guilabel>Opcions principals</guilabel>, pot "
@@ -946,7 +1046,7 @@ msgstr ""
 "cop que passi el temps de demora."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -955,18 +1055,18 @@ msgstr ""
 "possible establir una contrasenya."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "El botó <guibutton>Avançat</guibutton> dóna algunes opcions addicionals."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Habilita ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -979,19 +1079,19 @@ msgstr ""
 "el vostre maquinari funciona amb ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Habilita SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1000,14 +1100,14 @@ msgstr ""
 "processador dual i habilitarà SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1020,20 +1120,33 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "A la pantalla <guibutton>Següent</guibutton>, es pot veure la llista de "
 "totes les entrades disponibles en el moment de l'arrencada. L'entrada per "
@@ -1044,13 +1157,13 @@ msgstr ""
 "Grub o modificar una existent. Cal estar familiaritzat amb Lilo o Grub per "
 "poder utilitzar aquestes eines."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1060,8 +1173,8 @@ msgstr ""
 "vulgueu que es mostri al menú. Coincideix amb l'ordre \"title\" del Grub. "
 "Per exemple: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1069,8 +1182,8 @@ msgstr ""
 "La <guilabel>Imatge</guilabel> conté el nom del nucli. Coincideix amb "
 "l'ordre de Grub \"kernel\". Per exemple /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1079,8 +1192,9 @@ msgstr ""
 "s'emmagatzemaran els nuclis. Coincideix amb l'ordre de Grub \"root\". Per "
 "exemple (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1088,8 +1202,8 @@ msgstr ""
 "El camp <guilabel>Annexar</guilabel> conté les opcions que han de donar-se "
 "al nucli en l'arrencada."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1097,8 +1211,8 @@ msgstr ""
 "Si la casella <guilabel>Defecte</guilabel> està marcada, Grub arrencarà "
 "aquesta entrada per defecte."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1106,90 +1220,57 @@ msgid ""
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Activa l'entrada automàtica per entrar automàticament"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr ""
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Podeu iniciar aquesta eina des de la línia d'ordres, escrivint <emphasis "
-"role=\"bold\">drakboot</emphasis> com a root. "
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Aquesta eina<placeholder type=\"footnote\" id=\"0\"/> li permet connectar-se "
-"al mateix usuari, si el seu entorn / escriptori, sense demanar cap "
-"contrasenya. Es diu autoconnexió. Això és generalment una bona idea quan "
-"només hi ha un usuari que utilitzi la màquina. "
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Es troba sota la pestanya <emphasis role=\"bold\">Arrencada</emphasis> al "
-"centre de control de Mageia amb l'etiqueta \"Configuració d'inici de sessió "
-"automàtic per iniciar sessió automàticament\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Els botons de la interfície són bastant òbvies:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Marqueu <guibutton>Inicia l'entorn gràfic quan el sistema s'inicia</"
-"guibutton>, si voleu que el sistema X Windows s'executi després de "
-"reiniciar. Si no és així, el sistema s'iniciarà en mode text. No obstant "
-"això, serà possible iniciar la interfície gràfica manualment. Això es pot "
-"fer amb el llançament de 'startx' o 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la primera casella està activada, les dues opcions estaran disponibles, "
-"marqueu qualsevol <guibutton>No, no vull autoconnexió</guibutton>, si voleu "
-"que el sistema per continuar ha de preguntar a l'usuari per connectar (i la "
-"contrasenya) o seleccionar <guibutton>Sí, vull autoconnexió amb aquest "
-"(usuari, escriptori)</guibutton>, si cal. En aquest cas, també és necessari "
-"per proveir el <guibutton>nom per defecte</guibutton> i "
-"l'<guibutton>escriptori per defecte</guibutton>."
+"Podeu iniciar aquesta eina des de la línia d'ordres, escrivint <emphasis "
+"role=\"bold\">drakboot</emphasis> com a root. "
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2551,22 +2632,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gestiona les particions de disc"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk o diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2574,7 +2655,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2584,19 +2665,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2606,21 +2687,29 @@ msgid ""
 "the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2629,25 +2718,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6686,13 +6775,14 @@ msgstr "Configura els passos de l'arrencada"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -9067,11 +9157,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Aquesta eina<placeholder type=\"footnote\" id=\"0\"/> es troba al centre de "
+"control de Mageia, sota la pestanya Compartir Xarxa, amb l'etiqueta "
+"<guilabel>Configura les comparticions WebDAV</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -9695,3 +9789,6 @@ msgid ""
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
 msgstr ""
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/cs.po b/docs/mcc-help/cs.po
index 228ad35b..37cf7bf2 100644
--- a/docs/mcc-help/cs.po
+++ b/docs/mcc-help/cs.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-04-28 15:25+0000\n"
 "Last-Translator: Jiří Vírava <appukonrad@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
@@ -681,7 +681,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Nastavit automatické přihlášení do systému"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Tento nástroj můžete spustit z příkazového řádku zadáním <emphasis role="
+"\"bold\">drakfont</emphasis> jako superuživatel."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Nastavit způsob zavedení systému"
 
@@ -691,20 +760,20 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 #, fuzzy
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot.png"
@@ -717,68 +786,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -787,33 +864,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -826,65 +903,78 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+msgid ""
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
 "example: Mageia3."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -892,68 +982,54 @@ msgid ""
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Nastavit automatické přihlášení do systému"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr ""
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr ""
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2165,22 +2241,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Spravovat diskové oddíly"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk nebo diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2188,7 +2264,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2198,19 +2274,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2220,21 +2296,29 @@ msgid ""
 "the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2243,25 +2327,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6300,13 +6384,14 @@ msgstr "Nastavit kroky zavádění systému"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -8719,11 +8804,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Tento nástroj<placeholder type=\"footnote\" id=\"0\"/> se nachází v "
+"ovládacím středisku Mageia v kartě pro Sdílení v síti označené "
+"<guilabel>Nastavit sdílení pomocí WebDAV</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -9347,3 +9436,6 @@ msgid ""
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
 msgstr ""
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/de.po b/docs/mcc-help/de.po
index b4c9183a..a1f34762 100644
--- a/docs/mcc-help/de.po
+++ b/docs/mcc-help/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2016-01-31 19:13+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -869,7 +869,96 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Autologin einrichten zur automatischen Anmeldung"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Sie können das Programm über die Kommandozeile aufrufen, indem Sie <emphasis "
+"role=\"bold\">drakauth</emphasis> als root eingeben."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Dieses Werkzeug<placeholder type=\"footnote\" id=\"0\"/> erlaubt Ihnen das "
+"immer der gleiche Nutzer automatisch mit seiner Desktopumgebung angemeldet "
+"wird, ohne das nach einem Passwort gefragt wird. Dies ist nützlich wenn es "
+"nur einen Nutzer gibt, welcher das System verwenden möchte."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Sie finden es im Mageia Kontrollzentrum in dem <emphasis role=\"bold"
+"\">Systemstart</emphasis> Tab unter \"Autologin einrichten zur automatischen "
+"Anmeldung\""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Die Schaltflächen der Benutzeroberfläche sind ziemlich eindeutig:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Aktiviere <guibutton>Grafische Arbeitsoberfläche nach dem Hochfahren "
+"automatisch starten</guibutton>, wenn Sie möchten, dass das X Window System "
+"beim Start ausgeführt werden soll. Falls nicht, startet das System im "
+"Textmodus. Trotzdem können Sie die grafische Oberfläche manuell starten. "
+"Diese kann durch den Befehl 'startx' oder 'systemctl start dm' gestartet "
+"werden."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Wenn die erste Box ausgewählt wurde sind zwei weitere Wahlmöglichkeiten "
+"verfügbar. Entweder <guibutton>Nein, ich will kein Autologin</guibutton>, "
+"falls Sie weiterhin möchten, dass das System Sie fragt, welcher Nutzer (mit "
+"Passwort) sich anmelden möchte oder wähle <guibutton>Ja, ich will Autologin "
+"mit diesem Benutzer und dieser Arbeitsumgebung</guibutton> falls gewünscht. "
+"Im letzteren Fall müssen Sie den <guilabel>Standardbenutzer</guilabel> und "
+"die <guilabel>Standard Arbeitsumgebung</guilabel> auswählen."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Bootmanager einrichten "
 
@@ -879,23 +968,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Wenn Sie ein UEFI System nutzen sieht die Benutzeroberfläche etwas anders "
 "aus, da dort kein Bootloader ausgewählt werden kann (erste Drop-Down Liste), "
 "da nur einer verfügbar ist."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -909,9 +999,10 @@ msgstr ""
 "role=\"bold\">drakboot --boot</emphasis> als root eingeben."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -920,16 +1011,17 @@ msgstr ""
 "Passworts, das System welches standardmäßig gestartet werden soll, etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Sie finden es im Systemstart Tab im Mageia Kontrollzentrum unter "
 "'Bootmanager einrichten'"
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -939,15 +1031,16 @@ msgstr ""
 "womöglich nicht mehr bootet !"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Im ersten Teil, genannt <guilabel>Bootloader</guilabel>, können Sie den "
 "<guibutton>Zu verwendender Bootloader</guibutton> auswählen, GRUB oder Lilo "
@@ -959,12 +1052,21 @@ msgstr ""
 "eventuell dazu führen, dass das System nicht bootet."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Im zweiten Teil, <guilabel>Hauptoptionen</guilabel> genannt, können Sie die "
@@ -975,7 +1077,7 @@ msgstr ""
 "der Bootloader das Standardsystem nach der verstrichenen Wartezeit starten."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -984,19 +1086,19 @@ msgstr ""
 "es möglich ein Passwort festzulegen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Die Schaltfläche <guibutton>Fortgeschritten</guibutton> bietet einige "
 "zusätzliche Optionen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI aktivieren:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1009,12 +1111,12 @@ msgstr ""
 "die Box wenn Ihre Hardware ACPI unterstützt."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP aktivieren:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1023,7 +1125,7 @@ msgstr ""
 "für Mehrprozessorsysteme."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1032,7 +1134,7 @@ msgstr ""
 "dualen Prozessor anzeigen und SMP aktivieren."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1041,7 +1143,7 @@ msgstr ""
 "aktivieren:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1054,20 +1156,34 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Login ID</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Im nächsten Bildschirm, nachdem man auf <guibutton>Weiter</guibutton> "
 "gedrückt hat, sehen Sie eine Liste aller Booteinträge. Der Haupteintrag ist "
@@ -1079,13 +1195,13 @@ msgstr ""
 "bestehenden zu ändern. Sie sollten sich mit Lilo oder Grub auskennen, wenn "
 "Sie dieses Werkzeug nutzen."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1095,8 +1211,8 @@ msgstr ""
 "hier hinein, was im Menü angezeigt werden soll. Es stimmt mit dem Grub "
 "Kommando 'title' überein, zum Beispiel Mageia3"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1104,8 +1220,8 @@ msgstr ""
 "Das <guilabel>Abbild</guilabel> Feld enthält den Kernel Namen. Es stimmt mit "
 "dem Grub Kommando \"kernel\" überein. Zum Beispiel /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1114,8 +1230,9 @@ msgstr ""
 "Kernel befindet. Es stimmt mit dem Grub Kommando \"root\" überein. Zum "
 "Beispiel (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1123,8 +1240,8 @@ msgstr ""
 "Das <guilabel>Hinzufügen / Erweitern</guilabel> Feld enthält die Parameter, "
 "welche dem Kernel zum Booten übergeben werden."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1132,8 +1249,8 @@ msgstr ""
 "Wenn die Box <guilabel>Standard</guilabel> ausgewählt ist, wird Grub mit "
 "diesem Eintrag standardmäßig booten."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1145,91 +1262,63 @@ msgstr ""
 "Datei und ein <guilabel>Netzwerk Profil</guilabel>, siehe <xref linkend="
 "\"draknetprofile\"/>, aus der Drop-Down Liste zu wählen."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Autologin einrichten zur automatischen Anmeldung"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Login ID</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Sie können das Programm über die Kommandozeile aufrufen, indem Sie <emphasis "
-"role=\"bold\">drakboot</emphasis> als root eingeben"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Dieses Werkzeug<placeholder type=\"footnote\" id=\"0\"/> erlaubt Ihnen das "
-"immer der gleiche Nutzer automatisch mit seiner Desktopumgebung angemeldet "
-"wird, ohne das nach einem Passwort gefragt wird. Dies ist nützlich wenn es "
-"nur einen Nutzer gibt, welcher das System verwenden möchte."
+"Im separaten <guilabel>Fortgeschritten</guilabel> Bildschirm ist es möglich, "
+"den <guilabel>Video-Modus</guilabel>, eine <guilabel>Init-RamDisk</guilabel> "
+"Datei und ein <guilabel>Netzwerk Profil</guilabel>, siehe <xref linkend="
+"\"draknetprofile\"/>, aus der Drop-Down Liste zu wählen."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Sie finden es im Mageia Kontrollzentrum in dem <emphasis role=\"bold"
-"\">Systemstart</emphasis> Tab unter \"Autologin einrichten zur automatischen "
-"Anmeldung\""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Die Schaltflächen der Benutzeroberfläche sind ziemlich eindeutig:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Aktiviere <guibutton>Grafische Arbeitsoberfläche nach dem Hochfahren "
-"automatisch starten</guibutton>, wenn Sie möchten, dass das X Window System "
-"beim Start ausgeführt werden soll. Falls nicht, startet das System im "
-"Textmodus. Trotzdem können Sie die grafische Oberfläche manuell starten. "
-"Diese kann durch den Befehl 'startx' oder 'systemctl start dm' gestartet "
-"werden."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Wenn die erste Box ausgewählt wurde sind zwei weitere Wahlmöglichkeiten "
-"verfügbar. Entweder <guibutton>Nein, ich will kein Autologin</guibutton>, "
-"falls Sie weiterhin möchten, dass das System Sie fragt, welcher Nutzer (mit "
-"Passwort) sich anmelden möchte oder wähle <guibutton>Ja, ich will Autologin "
-"mit diesem Benutzer und dieser Arbeitsumgebung</guibutton> falls gewünscht. "
-"Im letzteren Fall müssen Sie den <guilabel>Standardbenutzer</guilabel> und "
-"die <guilabel>Standard Arbeitsumgebung</guilabel> auswählen."
+"Sie können das Programm über die Kommandozeile aufrufen, indem Sie <emphasis "
+"role=\"bold\">drakboot</emphasis> als root eingeben"
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2579,22 +2668,22 @@ msgstr ""
 "nicht, das Sie hierfür weitere Informationen benötigen."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Partitionen verwalten"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk oder diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2605,7 +2694,7 @@ msgstr ""
 "emphasis> als root eingeben."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2621,7 +2710,7 @@ msgstr ""
 "emphasis>, wenn Sie sich nicht sicher sind, dass Sie fortfahren möchten."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2631,12 +2720,12 @@ msgstr ""
 "bearbeiten möchten."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2654,9 +2743,17 @@ msgstr ""
 "anderen Knöpfe werden auf der rechten Seite sichtbar, nachdem Sie auf eine "
 "Partition geklickt haben."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2667,13 +2764,13 @@ msgstr ""
 "werden."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Es ist nur Möglich die Größe einer Partition auf der rechten Seite zu ändern"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2686,22 +2783,23 @@ msgstr ""
 "wenn ein leerer Platz auf dem Laufwerk ausgewählt wurde"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Sie können auch einen Einhängepunkt wählen der nicht existiert, er wird "
 "erstellt."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Beim Auswählen von <emphasis><guibutton>In den Experten-Modus wechseln</"
@@ -2709,7 +2807,7 @@ msgstr ""
 "das ändern der Bezeichnung, wie Sie im Screenshot unten sehen können."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7429,13 +7527,14 @@ msgstr "Booteinstellungen konfigurieren"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10306,10 +10405,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Dieses Werkzeug<placeholder type=\"footnote\" id=\"0\"/> befindet sich im "
 "Mageia Kontrollzentrum unter dem Reiter <emphasis role=\"bold\">System</"
@@ -11132,3 +11232,6 @@ msgstr ""
 "Möglichkeit die Änderung abzubrechen und die vorige Konfiguration zu "
 "behalten oder die Änderung zu übernehmen. In diesem Fall müssen Sie sich "
 "abmelden und neu anmelden um die neue Konfiguration zu aktivieren."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/el.po b/docs/mcc-help/el.po
index 591f606d..28ed8f34 100644
--- a/docs/mcc-help/el.po
+++ b/docs/mcc-help/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2016-01-09 07:45+0100\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -868,7 +868,95 @@ msgstr ""
 "πληροφορίες για να το πραγματοποιήσετε."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Ρυθμίστε την αυτόματη σύνδεση χρήστη"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
+"πληκτρολογώντας <emphasis role= \"bold\">drakauth</emphasis> ως διαχειριστής "
+"συστήματος."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Αυτό το εργαλείο <placeholder type=\"footnote\" id=\"0\"/> σας επιτρέπει την "
+"αυτόματη σύνδεση ενός χρήστη, χωρίς να ερωτηθεί για τον κωδικό πρόσβασης. "
+"Συνήθως εξυπηρετεί όταν υπάρχει μόνο ένας χρήστης στο μηχάνημα."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Θα το βρείτε στην καρτέλα <emphasis role=\"bold\">Εκκίνηση</emphasis> στο "
+"Κέντρο Ελέγχου Mageia με την ονομασία «Ρύθμιση της αυτόματης εκκίνησης "
+"χρήστη»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Τα κουμπιά ελέγχου είναι ευνόητα:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Επιλέξτε την <guibutton>«Εκτέλεση του γραφικού περιβάλλοντος κατά την "
+"εκκίνηση του συστήματος»</guibutton>, αν επιθυμείτε την εκκίνηση του "
+"συστήματος γραφικού περιβάλλοντος X Window System κατά την εκκίνηση. "
+"Διαφορετικά, το σύστημα θα εκκινηθεί σε λειτουργία κειμένου (χωρίς γραφικό "
+"περιβάλλον). Αυτό μπορεί να πραγματοποιηθεί χειροκίνητα εκτελώντας την "
+"εντολή «startx» ή «systemctl start dm»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Αν η πρώτη επιλογή είναι επιλεγμένη, προσφέρονται άλλες δυο επιλογές· "
+"<guibutton>Όχι δεν επιθυμώ την αυτόματη σύνδεση</guibutton>, αν επιθυμείτε "
+"τη σύνδεση σε κάθε εκκίνηση με το όνομα χρήστη και τον κωδικό πρόσβασης ή "
+"επιλέξτε <guibutton>Ναι, επιθυμώ την αυτόματη σύνδεση</guibutton>. Σε αυτήν "
+"την περίπτωση, θα πρέπει να παράσχετε το προεπιλεγμένο <guilabel>Όνομα "
+"χρήστη</guilabel> και το εξ ορισμού <guilabel>Γραφικό περιβάλλον</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Ρυθμίστε την εκκίνηση του υπολογιστή"
 
@@ -878,24 +966,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Αν χρησιμοποιείτε ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς "
-"διαφορετικό όπως ότι "
-"δεν μπορείτε να επιλέξετε το πρόγραμμα εκκίνησης (πρώτη αναπτυσσόμενη λίστα) "
-"διότι μόνο μια επιλογή είναι διαθέσιμη."
+"διαφορετικό όπως ότι δεν μπορείτε να επιλέξετε το πρόγραμμα εκκίνησης (πρώτη "
+"αναπτυσσόμενη λίστα) διότι μόνο μια επιλογή είναι διαθέσιμη."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -910,9 +998,10 @@ msgstr ""
 "διαχειριστής συστήματος."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -921,16 +1010,17 @@ msgstr ""
 "ορισμός κωδικού πρόσβασης, την προκαθορισμένη εκκίνηση, κλπ) "
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Θα το βρείτε στην καρτέλα Εκκίνηση στο Κέντρο Ελέγχου Mageia με την ονομασία "
 "«Ρύθμιση της εκκίνησης του συστήματος»."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -940,15 +1030,16 @@ msgstr ""
 "υπολογιστή!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Στην πρώτη ενότητα που ονομάζεται <guilabel>Πρόγραμμα εκκίνησης</guilabel>, "
 "μπορείτε να επιλέξετε το <guibutton>Πρόγραμμα εκκίνησης που θα "
@@ -961,12 +1052,21 @@ msgstr ""
 "υπολογιστή."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Στο δεύτερο τμήμα με τίτλο <guilabel>Κύριες επιλογές</guilabel>, μπορείτε να "
@@ -977,7 +1077,7 @@ msgstr ""
 "θα εκκινήσει το προεπιλεγμένο μετά το πέρας της χρονικής καθυστέρησης."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -986,19 +1086,19 @@ msgstr ""
 "να καθορίσετε έναν κωδικό πρόσβασης."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Το κουμπί <guibutton>Για προχωρημένους</guibutton> παρέχει κάποιες επιπλέον "
 "επιλογές."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Ενεργοποίηση ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1011,12 +1111,12 @@ msgstr ""
 "APM. Επιλέξτε αυτό το πλαίσιο αν το υλικό σας είναι συμβατό με το ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Ενεργοποίηση SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1025,7 +1125,7 @@ msgstr ""
 "αρχιτεκτονική επεξεργαστών πολλαπλών πυρήνων."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1034,7 +1134,7 @@ msgstr ""
 "επεξεργαστή και θα ενεργοποιήσει το SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1043,7 +1143,7 @@ msgstr ""
 "APIC:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1063,20 +1163,34 @@ msgstr ""
 "το APIC και/ή το Τοπικό APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Αναγνωριστικό σύνδεσης</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
+msgid ""
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Στην <guibutton>επόμενη</guibutton> οθόνη, μπορείτε να δείτε τη λίστα όλες "
 "τις διαθέσιμες καταχωρήσεις εκκίνησης. Η εξ ορισμού εμφανίζεται με ένα "
@@ -1087,13 +1201,13 @@ msgstr ""
 "καταχώρηση του Grub ή να επεξεργαστείτε μια υπάρχουσα. Θα πρέπει να είστε "
 "εξοικειωμένοι με το Grub ή το Lilo για να χρησιμοποιήσετε αυτά τα εργαλεία."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1103,8 +1217,8 @@ msgstr ""
 "γράψετε οτιδήποτε επιθυμείτε να εμφανίζεται στο μενού. Αντιστοιχεί στην "
 "εντολή του Grub «title». Για παράδειγμα: Mageia 3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1112,8 +1226,8 @@ msgstr ""
 "Το πεδίο <guilabel>Εικόνα</guilabel> περιέχει το όνομα του πυρήνα. "
 "Αντιστοιχεί στην εντολή του Grub «kernel». Για παράδειγμα /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1122,8 +1236,9 @@ msgstr ""
 "που βρίσκεται ο πυρήνας. Αντιστοιχεί στην εντολή του Grub «root». Για "
 "παράδειγμα (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1131,8 +1246,8 @@ msgstr ""
 "Το πεδίο <guilabel>Επιλογές περασμένες στον πυρήνα</guilabel> περιέχει τις "
 "επιλογές του πυρήνα κατά την εκκίνηση."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1140,8 +1255,8 @@ msgstr ""
 "Αν είναι επιλεγμένο το πλαίσιο <guilabel>Προκαθορισμένο</guilabel>, το Grub "
 "θα φορτώνει τη συγκεκριμένη καταχώρηση εξ ορισμού."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1153,90 +1268,64 @@ msgstr ""
 "<guilabel>initrd</guilabel> και ένα <guilabel>προφίλ δικτύου</guilabel>, "
 "δείτε στο <xref linkend=\"draknetprofile\"></xref> στην κυλιόμενη λίστα."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Ρυθμίστε την αυτόματη σύνδεση χρήστη"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Αναγνωριστικό σύνδεσης</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
-"πληκτρολογώντας <emphasis role= \"bold\">drakboot</emphasis> ως διαχειριστής "
-"συστήματος."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Αυτό το εργαλείο <placeholder type=\"footnote\" id=\"0\"/> σας επιτρέπει την "
-"αυτόματη σύνδεση ενός χρήστη, χωρίς να ερωτηθεί για τον κωδικό πρόσβασης. "
-"Συνήθως εξυπηρετεί όταν υπάρχει μόνο ένας χρήστης στο μηχάνημα."
+"Στην επιπλέον οθόνη <guilabel>Για προχωρημένους</guilabel>, μπορείτε να "
+"επιλέξετε τη <guilabel>λειτουργία βίντεο</guilabel>, ένα αρχείο "
+"<guilabel>initrd</guilabel> και ένα <guilabel>προφίλ δικτύου</guilabel>, "
+"δείτε στο <xref linkend=\"draknetprofile\"></xref> στην κυλιόμενη λίστα."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Θα το βρείτε στην καρτέλα <emphasis role=\"bold\">Εκκίνηση</emphasis> στο "
-"Κέντρο Ελέγχου Mageia με την ονομασία «Ρύθμιση της αυτόματης εκκίνησης "
-"χρήστη»."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Τα κουμπιά ελέγχου είναι ευνόητα:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Επιλέξτε την <guibutton>«Εκτέλεση του γραφικού περιβάλλοντος κατά την "
-"εκκίνηση του συστήματος»</guibutton>, αν επιθυμείτε την εκκίνηση του "
-"συστήματος γραφικού περιβάλλοντος X Window System κατά την εκκίνηση. "
-"Διαφορετικά, το σύστημα θα εκκινηθεί σε λειτουργία κειμένου (χωρίς γραφικό "
-"περιβάλλον). Αυτό μπορεί να πραγματοποιηθεί χειροκίνητα εκτελώντας την "
-"εντολή «startx» ή «systemctl start dm»."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Αν η πρώτη επιλογή είναι επιλεγμένη, προσφέρονται άλλες δυο επιλογές· "
-"<guibutton>Όχι δεν επιθυμώ την αυτόματη σύνδεση</guibutton>, αν επιθυμείτε "
-"τη σύνδεση σε κάθε εκκίνηση με το όνομα χρήστη και τον κωδικό πρόσβασης ή "
-"επιλέξτε <guibutton>Ναι, επιθυμώ την αυτόματη σύνδεση</guibutton>. Σε αυτήν "
-"την περίπτωση, θα πρέπει να παράσχετε το προεπιλεγμένο <guilabel>Όνομα "
-"χρήστη</guilabel> και το εξ ορισμού <guilabel>Γραφικό περιβάλλον</guilabel>."
+"Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
+"πληκτρολογώντας <emphasis role= \"bold\">drakboot</emphasis> ως διαχειριστής "
+"συστήματος."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2687,22 +2776,22 @@ msgstr ""
 "περισσότερη επεξήγηση επ' αυτού."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Διαχειριστείτε τις κατατμήσεις των σκληρών δίσκων"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk ή diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2713,7 +2802,7 @@ msgstr ""
 "\"bold\">diskdrake</emphasis> ως διαχειριστής συστήματος."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2729,7 +2818,7 @@ msgstr ""
 "δεν είστε σίγουρος ότι επιθυμείτε να συνεχίσετε."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2739,12 +2828,12 @@ msgstr ""
 "(sda, sdb, sdc, κλπ)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2762,9 +2851,17 @@ msgstr ""
 "άλλα κουμπιά γίνονται ορατά στο δεξιό τμήμα αφού κάνετε κλικ σε μια "
 "κατάτμηση. "
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2775,12 +2872,12 @@ msgstr ""
 "κατάτμηση πρώτα."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Μπορείτε να αλλάξετε το μέγεθος μιας κατάτμησης μόνο προς τα δεξιά"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2793,22 +2890,23 @@ msgstr ""
 "guibutton> εμφανίζεται όταν έχει επιλεγεί ένα κενό τμήμα του δίσκου."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Μπορείτε να επιλέξετε ένα μη υπάρχον σημείο προσάρτησης καθώς αυτό θα "
 "δημιουργηθεί."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Επιλέγοντας σε <emphasis><guibutton>Εναλλαγή σε προχωρημένη λειτουργία</"
@@ -2817,7 +2915,7 @@ msgstr ""
 "στιγμιότυπο."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6272,8 +6370,8 @@ msgid ""
 "by default and you have to also install the drakwizard and drakwizard-base "
 "packages."
 msgstr ""
-"Ο σκοπός του εργαλείου αυτού<placeholder type=\"footnote\" id=\"0\"/> είναι η "
-"ρύθμιση της ώρας του διακομιστή σας συγχρονίζοντάς την με έναν εξωτερικό "
+"Ο σκοπός του εργαλείου αυτού<placeholder type=\"footnote\" id=\"0\"/> είναι "
+"η ρύθμιση της ώρας του διακομιστή σας συγχρονίζοντάς την με έναν εξωτερικό "
 "διακομιστή. Δεν είναι εγκατεστημένο εξ ορισμού και θα πρέπει επίσης να "
 "εγκαταστήσετε τα πακέτα drakwizard και drakwizard-base."
 
@@ -6290,8 +6388,8 @@ msgid ""
 "because this server always points to available time servers."
 msgstr ""
 "Μετά την οθόνη υποδοχής (δείτε ανωτέρω), η δεύτερη σας ρωτά να επιλέξετε "
-"τρεις εξυπηρετητές ώρας από την αναπτυσσόμενη λίστα και σας συστήνει τη χρήση "
-"του pool.ntp.org δυο φορές διότι αυτός ο εξυπηρετητής υποδεικνύει σε "
+"τρεις εξυπηρετητές ώρας από την αναπτυσσόμενη λίστα και σας συστήνει τη "
+"χρήση του pool.ntp.org δυο φορές διότι αυτός ο εξυπηρετητής υποδεικνύει σε "
 "διαθέσιμους εξυπηρετητές ώρας."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
@@ -6323,12 +6421,12 @@ msgid ""
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
-"Οι οθόνες που ακολουθούν σας επιτρέπουν να επιλέξετε την περιοχή και την πόλη "
-"και στη συνέχεια καταλήγει στη σύνοψη. Αν κάτι είναι λανθασμένο, μπορείτε "
-"φυσικά να το αλλάξετε χρησιμοποιώντας το κουμπί <guibutton>Προηγούμενο<"
-"/guibutton>. Αν όλα είναι σωστά, κάντε κλικ στο κουμπί <guibutton>Επόμενο<"
-"/guibutton> για να προχωρήσετε στη δοκιμή. Ίσως να διαρκέσει ένα χρονικό "
-"διάστημα μέχρι να καταλήξετε στην παρακάτω οθόνη:"
+"Οι οθόνες που ακολουθούν σας επιτρέπουν να επιλέξετε την περιοχή και την "
+"πόλη και στη συνέχεια καταλήγει στη σύνοψη. Αν κάτι είναι λανθασμένο, "
+"μπορείτε φυσικά να το αλλάξετε χρησιμοποιώντας το κουμπί "
+"<guibutton>Προηγούμενο</guibutton>. Αν όλα είναι σωστά, κάντε κλικ στο "
+"κουμπί <guibutton>Επόμενο</guibutton> για να προχωρήσετε στη δοκιμή. Ίσως να "
+"διαρκέσει ένα χρονικό διάστημα μέχρι να καταλήξετε στην παρακάτω οθόνη:"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_ntp.xml:72
@@ -6359,10 +6457,9 @@ msgid ""
 "clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
 "step-tickers.orig</code>;"
 msgstr ""
-"Αποθηκεύει τα αρχεία <code>/etc/sysconfig/clock</code> στο <code>"
-"/etc/sysconfig/"
-"clock.orig</code> και <code>/etc/ntp/step-tickers</code> στο <code>"
-"/etc/ntp/step-tickers.orig</code>·"
+"Αποθηκεύει τα αρχεία <code>/etc/sysconfig/clock</code> στο <code>/etc/"
+"sysconfig/clock.orig</code> και <code>/etc/ntp/step-tickers</code> στο "
+"<code>/etc/ntp/step-tickers.orig</code>·"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakwizard_ntp.xml:104
@@ -6388,8 +6485,8 @@ msgid ""
 "Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
 "code> services;"
 msgstr ""
-"Διακοπή και έναρξη των υπηρεσιών <code>crond</code>, <code>atd</code> και <"
-"code>ntpd</code>·"
+"Διακοπή και έναρξη των υπηρεσιών <code>crond</code>, <code>atd</code> και "
+"<code>ntpd</code>·"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakwizard_ntp.xml:119
@@ -6445,10 +6542,10 @@ msgid ""
 "protocol used to transfer files from one host to another host over a "
 "<acronym>TCP</acronym>-based network, such as the Internet. (From Wikipedia)"
 msgstr ""
-"Το Πρωτόκολλο Μεταφοράς Αρχείων (File Transfer Protocol <acronym>FTP</acronym>"
-") είναι ένα πρότυπο δικτυακού πρωτοκόλλου που χρησιμοποιείται για τη μεταφορά "
-"αρχείων από τον έναν υπολογιστή στον άλλον μέσω ενός δικτύου <acronym>TCP<"
-"/acronym>, όπως το διαδίκτυο. (Από τη Βικιπαίδεια)"
+"Το Πρωτόκολλο Μεταφοράς Αρχείων (File Transfer Protocol <acronym>FTP</"
+"acronym>) είναι ένα πρότυπο δικτυακού πρωτοκόλλου που χρησιμοποιείται για τη "
+"μεταφορά αρχείων από τον έναν υπολογιστή στον άλλον μέσω ενός δικτύου "
+"<acronym>TCP</acronym>, όπως το διαδίκτυο. (Από τη Βικιπαίδεια)"
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_proftpd.xml:21
@@ -6476,8 +6573,8 @@ msgid ""
 "Exposing the FTP server to the Internet has it's risks. Be ready for bad "
 "things."
 msgstr ""
-"Η έκθεση του εξυπηρετητή FTP στο διαδίκτυο μπορεί να υπολανθάνει "
-"κινδύνους. Να είστε έτοιμοι για παν ενδεχόμενο."
+"Η έκθεση του εξυπηρετητή FTP στο διαδίκτυο μπορεί να υπολανθάνει κινδύνους. "
+"Να είστε έτοιμοι για παν ενδεχόμενο."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_proftpd.xml:49
@@ -6515,8 +6612,7 @@ msgid ""
 "(File eXchange Protocol)"
 msgstr ""
 "Διαμόρφωση της θύρας ακρόασης, τον κατάλογο chroot, επιτρέψτε τη συνέχιση "
-"μεταφοράς και το <acronym>FXP</acronym> "
-"(File eXchange Protocol)"
+"μεταφοράς και το <acronym>FXP</acronym> (File eXchange Protocol)"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:74
@@ -6561,8 +6657,8 @@ msgid ""
 "before you can access to it."
 msgstr ""
 "Αυτό το εργαλείο<placeholder type=\"footnote\" id=\"0\"/> μπορεί να σας "
-"βοηθήσει να ρυθμίσετε έναν εξυπηρετητή διαμεσολαβητή. Είναι ένα "
-"συστατικό του drakwizard το οποίο θα πρέπει να έχει εγκατασταθεί από πριν."
+"βοηθήσει να ρυθμίσετε έναν εξυπηρετητή διαμεσολαβητή. Είναι ένα συστατικό "
+"του drakwizard το οποίο θα πρέπει να έχει εγκατασταθεί από πριν."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_squid.xml:29
@@ -6674,8 +6770,8 @@ msgstr "drakwizard-proxy-step5.png"
 #: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Χορηγήστε την πρόσβαση στα τοπικά δίκτυα και κάντε κλικ στο <guibutton>"
-"Επόμενο</guibutton>."
+"Χορηγήστε την πρόσβαση στα τοπικά δίκτυα και κάντε κλικ στο "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_squid.xml:116
@@ -6753,8 +6849,8 @@ msgid ""
 "Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
 "orig;</code>"
 msgstr ""
-"Αποθήκευση του <code>/etc/squid/squid.conf</code> στο <code>"
-"/etc/squid/squid.conf.orig</code>·"
+"Αποθήκευση του <code>/etc/squid/squid.conf</code> στο <code>/etc/squid/squid."
+"conf.orig</code>·"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakwizard_squid.xml:202
@@ -6762,8 +6858,8 @@ msgid ""
 "Creating a new <code>squid.conf</code> starting from <code>squid.conf."
 "default</code> and adding the new parameters:"
 msgstr ""
-"Δημιουργία ενός νέου <code>squid.conf</code> ξεκινώντας από το <code>"
-"squid.conf.default</code> και πρόσθεση των νέων παραμέτρων:"
+"Δημιουργία ενός νέου <code>squid.conf</code> ξεκινώντας από το <code>squid."
+"conf.default</code> και πρόσθεση των νέων παραμέτρων:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakwizard_squid.xml:208
@@ -6790,7 +6886,8 @@ msgstr "http_port"
 msgid ""
 "<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
 msgstr ""
-"<code>level</code> 1, 2 ή 3 και <code>http_access</code> ανάλογα με το επίπεδο"
+"<code>level</code> 1, 2 ή 3 και <code>http_access</code> ανάλογα με το "
+"επίπεδο"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakwizard_squid.xml:229
@@ -6888,9 +6985,9 @@ msgid ""
 "Choose <guilabel>Expert</guilabel> for all options or <guilabel>Newbie</"
 "guilabel> to skip steps 3-7, click <guibutton>Next</guibutton>."
 msgstr ""
-"Επιλέξτε <guilabel>Ειδήμονας</guilabel> για όλες τις επιλογές ή <guilabel>"
-"Αρχάριος</guilabel> για την παράλειψη των βημάτων 3-7· κάντε κλικ στο <"
-"guibutton>Επόμενο</guibutton>."
+"Επιλέξτε <guilabel>Ειδήμονας</guilabel> για όλες τις επιλογές ή "
+"<guilabel>Αρχάριος</guilabel> για την παράλειψη των βημάτων 3-7· κάντε κλικ "
+"στο <guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:39
@@ -6927,9 +7024,9 @@ msgid ""
 "Allow a variety of authentication methods users can use while connecting, "
 "then click <guibutton>Next</guibutton>."
 msgstr ""
-"Επιτρέπει μια ποικιλία μεθόδων ταυτοποίησης που μπορούν να χρησιμοποιήσουν οι "
-"χρήστες κατά την σύνδεση· στη συνέχεια κάντε κλικ στο κουμπί <guibutton>"
-"Επόμενο</guibutton>."
+"Επιτρέπει μια ποικιλία μεθόδων ταυτοποίησης που μπορούν να χρησιμοποιήσουν "
+"οι χρήστες κατά την σύνδεση· στη συνέχεια κάντε κλικ στο κουμπί "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:61
@@ -6947,8 +7044,8 @@ msgid ""
 "Choose logging facility and level of output, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
-"Επιλέξτε τις καταγραφές facility και το επίπεδο εξόδου και κάντε κλικ στο <"
-"guibutton>Επόμενο</guibutton>."
+"Επιλέξτε τις καταγραφές facility και το επίπεδο εξόδου και κάντε κλικ στο "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:72
@@ -6964,8 +7061,8 @@ msgstr "drakwizard-sshd-step5.png"
 #: en/drakwizard_sshd.xml:79
 msgid "Configure per-login settings, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Διαμόρφωση των ρυθμίσεων ανά σύνδεση και κλικ στο <guibutton>Επόμενο<"
-"/guibutton>."
+"Διαμόρφωση των ρυθμίσεων ανά σύνδεση και κλικ στο <guibutton>Επόμενο</"
+"guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:83
@@ -6982,8 +7079,8 @@ msgstr "drakwizard-sshd-step6.png"
 msgid ""
 "Configure the user access settings, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Διαμόρφωση των ρυθμίσεων πρόσβασης του χρήστη, και κάντε κλικ στο <guibutton>"
-"Επόμενο</guibutton>."
+"Διαμόρφωση των ρυθμίσεων πρόσβασης του χρήστη, και κάντε κλικ στο "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:94
@@ -7018,8 +7115,8 @@ msgstr "drakwizard-sshd-step9.png"
 #: en/drakxservices.xml:3
 msgid "Manage system services by enabling or disabling them"
 msgstr ""
-"Διαχειριστείτε τις υπηρεσίες συστήματος ενεργοποιώντας τες ή απενεργοποιώντας "
-"τες."
+"Διαχειριστείτε τις υπηρεσίες συστήματος ενεργοποιώντας τες ή "
+"απενεργοποιώντας τες."
 
 #. type: Content of: <section><info><subtitle>
 #: en/drakxservices.xml:3
@@ -7039,8 +7136,7 @@ msgid ""
 msgstr ""
 "Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
 "πληκτρολογώντας <emphasis role= \"bold\">drakxservices</emphasis> ως "
-"διαχειριστής "
-"συστήματος."
+"διαχειριστής συστήματος."
 
 #. type: Content of: <section><info><title>
 #: en/harddrake2.xml:10
@@ -7112,8 +7208,8 @@ msgid ""
 "about the content of the fields."
 msgstr ""
 "Η δεξιά στήλη εμφανίζει πληροφορίες σχετικά με την επιλεγμένη συσκευή. Το "
-"μενού <guimenu>Βοήθεια -&gt; Περιγραφή των πεδίων</guimenu> δίνει πληροφορίες "
-"σχετικά με το περιεχόμενο των πεδίων."
+"μενού <guimenu>Βοήθεια -&gt; Περιγραφή των πεδίων</guimenu> δίνει "
+"πληροφορίες σχετικά με το περιεχόμενο των πεδίων."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:43
@@ -7131,9 +7227,10 @@ msgid ""
 "parameterize the module which is used in relation to the device. This must "
 "used by experts only."
 msgstr ""
-"<guibutton>Ορισμός επιλογών του τρέχοντος οδηγού</guibutton>: χρησιμοποιείται "
-"για την παραμετροποίηση του αρθρώματος που χρησιμοποιείται σχετισμένο με τη "
-"συσκευή. Αυτό θα πρέπει να χρησιμοποιείται μόνο από ειδήμονες."
+"<guibutton>Ορισμός επιλογών του τρέχοντος οδηγού</guibutton>: "
+"χρησιμοποιείται για την παραμετροποίηση του αρθρώματος που χρησιμοποιείται "
+"σχετισμένο με τη συσκευή. Αυτό θα πρέπει να χρησιμοποιείται μόνο από "
+"ειδήμονες."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/harddrake2.xml:54
@@ -7142,8 +7239,8 @@ msgid ""
 "configure the device. The tool can often be accessed directly from the MCC."
 msgstr ""
 "<guibutton>Εκτέλεση του εργαλείου διαμόρφωσης</guibutton>: πρόσβαση στο "
-"εργαλείο διαμόρφωσης της συσκευής. Συχνά μπορεί να προσπελαστεί απευθείας από "
-"το Κέντρο Έλεγχου Mageia."
+"εργαλείο διαμόρφωσης της συσκευής. Συχνά μπορεί να προσπελαστεί απευθείας "
+"από το Κέντρο Έλεγχου Mageia."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:68
@@ -7216,9 +7313,9 @@ msgid ""
 msgstr ""
 "Το keyboarddrake<placeholder type=\"footnote\" id=\"0\"/> βοηθά στην "
 "διαμόρφωση της βασικής διάταξης του πληκτρολογίου. Επηρεάζει την διάταξη του "
-"πληκτρολογίου για όλους τους χρήστες. Είναι διαθέσιμο από την ενότητα «Υλικό» "
-"στο κέντρο ελέγχου Mageia (ΚΕM) με την ονομασία «Διαμόρφωση του ποντικιού και "
-"του πληκτρολογίου». "
+"πληκτρολογίου για όλους τους χρήστες. Είναι διαθέσιμο από την ενότητα "
+"«Υλικό» στο κέντρο ελέγχου Mageia (ΚΕM) με την ονομασία «Διαμόρφωση του "
+"ποντικιού και του πληκτρολογίου». "
 
 #. type: Content of: <section><section><title>
 #: en/keyboarddrake.xml:29
@@ -7413,19 +7510,19 @@ msgid ""
 "possible to save the results in the .txt format by clicking on the <emphasis "
 "role=\"bold\">Save</emphasis> button."
 msgstr ""
-"Πρώτα εισαγάγετε την συμβολοσειρά που επιθυμείτε να αναζητήσετε στο πεδίο <"
-"emphasis role=\"bold\">Ταιριάζει</emphasis> και/ή αυτήν που <emphasis>δεν "
+"Πρώτα εισαγάγετε την συμβολοσειρά που επιθυμείτε να αναζητήσετε στο πεδίο "
+"<emphasis role=\"bold\">Ταιριάζει</emphasis> και/ή αυτήν που <emphasis>δεν "
 "θέλετε</emphasis> να εμφανιστεί στο πεδίο <emphasis role=\"bold\">αλλά δεν "
 "ταιριάζει</emphasis>. Στη συνέχεια επιλέξτε τα αρχεία που θα γίνει η "
 "αναζήτηση από το πλαίσιο <guilabel>Επιλέξτε αρχείο</guilabel>. Προαιρετικά "
-"μπορείτε να περιορίσετε την αναζήτηση σε μια μόνον ημέρα. Επιλέξτε την από το "
-"<emphasis role=\"bold\">ημερολόγιο</emphasis>, μέσω των μικρών βελών σε κάθε "
-"πλευρά του μηνός και του έτους, και επιλέξτε «<guibutton>Εμφάνιση μόνον για "
-"την επιλεγμένη ημέρα</guibutton>». Εν τέλει, κάντε κλικ στο κουμπί <guibutton>"
-"αναζήτηση</guibutton> ούτως ώστε να προβληθούν τα αποτελέσματα στο παράθυρο "
-"με τίτλο <guilabel>Περιεχόμενο του αρχείου</guilabel>. Υπάρχει η δυνατότητα "
-"αποθήκευσης των αποτελεσμάτων υπό μορφή .txt κάνοντας κλικ στο κουμπί <"
-"emphasis role=\"bold\">Αποθήκευση</emphasis>."
+"μπορείτε να περιορίσετε την αναζήτηση σε μια μόνον ημέρα. Επιλέξτε την από "
+"το <emphasis role=\"bold\">ημερολόγιο</emphasis>, μέσω των μικρών βελών σε "
+"κάθε πλευρά του μηνός και του έτους, και επιλέξτε «<guibutton>Εμφάνιση μόνον "
+"για την επιλεγμένη ημέρα</guibutton>». Εν τέλει, κάντε κλικ στο κουμπί "
+"<guibutton>αναζήτηση</guibutton> ούτως ώστε να προβληθούν τα αποτελέσματα "
+"στο παράθυρο με τίτλο <guilabel>Περιεχόμενο του αρχείου</guilabel>. Υπάρχει "
+"η δυνατότητα αποθήκευσης των αποτελεσμάτων υπό μορφή .txt κάνοντας κλικ στο "
+"κουμπί <emphasis role=\"bold\">Αποθήκευση</emphasis>."
 
 #. type: Content of: <section><section><note><para>
 #: en/logdrake.xml:36
@@ -7464,12 +7561,11 @@ msgid ""
 "services are displayed and you can choose which ones you want to look watch. "
 "(See screenshot above)."
 msgstr ""
-"Για την διαμόρφωση του εργαλείου, κάντε κλικ στο κουμπί <emphasis "
-"role=\"bold\">Συναγερμός μέσω αλληλογραφίας</emphasis> και στην επόμενη "
-"οθόνη, στο <guibutton>Διαμόρφωση του συστήματος συναγερμού μέσω "
-"αλληλογραφίας</guibutton>. Εδώ εμφανίζονται όλες οι τρέχουσες υπηρεσίες και "
-"μπορείτε να επιλέξετε αυτές που θα εποπτεύονται (Δείτε στο παρακάτω "
-"στιγμιότυπο)."
+"Για την διαμόρφωση του εργαλείου, κάντε κλικ στο κουμπί <emphasis role=\"bold"
+"\">Συναγερμός μέσω αλληλογραφίας</emphasis> και στην επόμενη οθόνη, στο "
+"<guibutton>Διαμόρφωση του συστήματος συναγερμού μέσω αλληλογραφίας</"
+"guibutton>. Εδώ εμφανίζονται όλες οι τρέχουσες υπηρεσίες και μπορείτε να "
+"επιλέξετε αυτές που θα εποπτεύονται (Δείτε στο παρακάτω στιγμιότυπο)."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:55
@@ -7532,9 +7628,9 @@ msgid ""
 msgstr ""
 "Στην επόμενη οθόνη, επιλέξτε τον <guilabel>Φόρτο</guilabel> που θεωρείτε "
 "απαράδεκτο. Ο φόρτος αναπαριστά την ζήτηση μιας διεργασίας, ένας υψηλός "
-"φόρτος επιβραδύνει το σύστημα και ένας υψηλός φόρτος μπορεί να υποδηλώνει ότι "
-"η διεργασία έχει τεθεί εκτός ελέγχου. Η τιμή εξ ορισμού είναι 3. Συνιστάται "
-"να θέσετε την τιμή του φόρτου 3 φορές τον αριθμό των επεξεργαστών."
+"φόρτος επιβραδύνει το σύστημα και ένας υψηλός φόρτος μπορεί να υποδηλώνει "
+"ότι η διεργασία έχει τεθεί εκτός ελέγχου. Η τιμή εξ ορισμού είναι 3. "
+"Συνιστάται να θέσετε την τιμή του φόρτου 3 φορές τον αριθμό των επεξεργαστών."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:103
@@ -7544,9 +7640,9 @@ msgid ""
 "or on the Internet)."
 msgstr ""
 "Στην τελευταία οθόνη, εισαγάγετε την <guilabel>διεύθυνση του ηλεκτρονικού "
-"ταχυδρομείου</guilabel> του ατόμου που θα πρέπει να ειδοποιηθεί και τον <"
-"guilabel>διακομιστή ταχυδρομείου</guilabel> που θα χρησιμοποιηθεί (τοπικός ή "
-"στο διαδίκτυο)."
+"ταχυδρομείου</guilabel> του ατόμου που θα πρέπει να ειδοποιηθεί και τον "
+"<guilabel>διακομιστή ταχυδρομείου</guilabel> που θα χρησιμοποιηθεί (τοπικός "
+"ή στο διαδίκτυο)."
 
 #. type: Content of: <section><info><title>
 #: en/lsnetdrake.xml:10
@@ -7585,8 +7681,8 @@ msgid ""
 "advance."
 msgstr ""
 "Αυτή η σελίδα δεν έχει συγγραφεί ακόμα λόγω ελλειπουσών πηγών. Αν πιστεύετε "
-"ότι μπορείτε να συγγράψετε ένα εγχειρίδιο, παρακαλώ επικοινωνήστε με την <"
-"link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">ομάδα "
+"ότι μπορείτε να συγγράψετε ένα εγχειρίδιο, παρακαλώ επικοινωνήστε με την "
+"<link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">ομάδα "
 "τεκμηρίωσης</link>. Ευχαριστούμε εκ των προτέρων."
 
 #. type: Content of: <section><info><title>
@@ -7627,8 +7723,8 @@ msgid ""
 "packages to work."
 msgstr ""
 "Η lspcidrake παρέχει τον κατάλογο όλων των συνδεδεμένων συσκευών στον "
-"υπολογιστή (USB, PCI και PCMCIA) και τους χρησιμοποιούμενους οδηγούς. Για την "
-"λειτουργία του απαιτούνται τα πακέτα ldetect και ldetect-lst."
+"υπολογιστή (USB, PCI και PCMCIA) και τους χρησιμοποιούμενους οδηγούς. Για "
+"την λειτουργία του απαιτούνται τα πακέτα ldetect και ldetect-lst."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/lspcidrake.xml:20
@@ -7640,8 +7736,8 @@ msgstr "lspcidrake1.png"
 msgid ""
 "With the -v option, lspcidrake adds the vendor and device identifications."
 msgstr ""
-"Με το όρισμα -v, η lspcidrake προσθέτει τα αναγνωριστικά του κατασκευαστή και "
-"της συσκευής."
+"Με το όρισμα -v, η lspcidrake προσθέτει τα αναγνωριστικά του κατασκευαστή "
+"και της συσκευής."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:27
@@ -7735,8 +7831,8 @@ msgid ""
 "Control Center under the tab <emphasis role=\"bold\">Software management.</"
 "emphasis>"
 msgstr ""
-"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/>"
-"Κέντρο Ελέγχου Mageia και στην καρτέλα <emphasis role=\"bold\">Διαχείριση "
+"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/"
+">Κέντρο Ελέγχου Mageia και στην καρτέλα <emphasis role=\"bold\">Διαχείριση "
 "λογισμικού</emphasis>"
 
 #. type: Content of: <section><para><note><para>
@@ -7746,9 +7842,9 @@ msgid ""
 "edit-media with some media checked as updates. If they are not, you are "
 "prompted to do so."
 msgstr ""
-"Για την λειτουργία του απαιτείται να έχουν διαμορφωθεί τα αποθετήρια μέσω του "
-"rpmdrake-edit-media με μερικά μέσα ενημέρωσης διαμορφωμένα. Αν δεν συμβαίνει "
-"αυτό, θα ερωτηθείτε να το κάνετε."
+"Για την λειτουργία του απαιτείται να έχουν διαμορφωθεί τα αποθετήρια μέσω "
+"του rpmdrake-edit-media με μερικά μέσα ενημέρωσης διαμορφωμένα. Αν δεν "
+"συμβαίνει αυτό, θα ερωτηθείτε να το κάνετε."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:23
@@ -7760,8 +7856,8 @@ msgid ""
 msgstr ""
 "Μετά από την εκτέλεση του εργαλείου, γίνεται σάρωση των ήδη εγκατεστημένων "
 "πακέτων και εμφανίζει αυτά με διαθέσιμη ενημέρωση στα αποθετήρια. Είναι εξ "
-"ορισμού επιλεγμένα για λήψη και εγκατάσταση. Κάντε κλικ στο κουμπί <guibutton>"
-"Ενημέρωση</guibutton> για την έναρξη της διαδικασίας."
+"ορισμού επιλεγμένα για λήψη και εγκατάσταση. Κάντε κλικ στο κουμπί "
+"<guibutton>Ενημέρωση</guibutton> για την έναρξη της διαδικασίας."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:28
@@ -7818,13 +7914,14 @@ msgstr "Ρυθμίστε τα στάδια εκκίνησης"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -7996,18 +8093,18 @@ msgid ""
 "installed. Each of these tabs gives a different set of tools that can be "
 "selected in the big right panel."
 msgstr ""
-"Το Κέντρο Ελέγχου Mageia (ΚΕM) διαθέτει οκτώ διαφορετικές επιλογές ή καρτέλες "
-"για να επιλέξετε στην αριστερή στήλη, ή δέκα αν έχετε εγκαταστήσει το πακέτο "
-"drakwizard. Η έκαστη καρτέλα προσφέρει ένα διαφορετικό σύνολο εργαλείων προς "
-"επιλογή από τον ευρύ πίνακα στα δεξιά."
+"Το Κέντρο Ελέγχου Mageia (ΚΕM) διαθέτει οκτώ διαφορετικές επιλογές ή "
+"καρτέλες για να επιλέξετε στην αριστερή στήλη, ή δέκα αν έχετε εγκαταστήσει "
+"το πακέτο drakwizard. Η έκαστη καρτέλα προσφέρει ένα διαφορετικό σύνολο "
+"εργαλείων προς επιλογή από τον ευρύ πίνακα στα δεξιά."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:8
 msgid ""
 "The ten following chapters are about those ten options and the related tools."
 msgstr ""
-"Τα παρακάτω δέκα κεφάλαια αναφέρονται στις δέκα αυτές επιλογές και τα σχετικά "
-"εργαλεία."
+"Τα παρακάτω δέκα κεφάλαια αναφέρονται στις δέκα αυτές επιλογές και τα "
+"σχετικά εργαλεία."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:10
@@ -8052,9 +8149,9 @@ msgid ""
 "In this screen you can choose between several tools to manage or share your "
 "local disks. Click on a link below to learn more."
 msgstr ""
-"Σε αυτή την οθόνη μπορείτε να διαλέξετε μεταξύ διάφορων εργαλείων διαχείρισης "
-"ή κοινής χρήσης των τοπικών σας δίσκων. Πατήστε σε έναν σύνδεσμο παρακάτω για "
-"να μάθετε περισσότερα."
+"Σε αυτή την οθόνη μπορείτε να διαλέξετε μεταξύ διάφορων εργαλείων "
+"διαχείρισης ή κοινής χρήσης των τοπικών σας δίσκων. Πατήστε σε έναν σύνδεσμο "
+"παρακάτω για να μάθετε περισσότερα."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-localdisks.xml:18
@@ -8092,8 +8189,8 @@ msgstr ""
 "Αυτή η οθόνη μαζί με αυτήν της <emphasis>Κοινής χρήσης</emphasis> είναι "
 "ορατές μόνο αν έχετε εγκαταστήσει το πακέτο <emphasis>drakwizard</emphasis>. "
 "Μπορείτε να επιλέξετε μεταξύ διαφόρων εργαλείων για την διαμόρφωση των "
-"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref "
-"linkend=\"mcc-sharing\"/>για να μάθετε περισσότερα."
+"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref linkend=\"mcc-"
+"sharing\"/>για να μάθετε περισσότερα."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-networkservices.xml:19
@@ -8322,8 +8419,8 @@ msgstr ""
 "Αυτή η οθόνη μαζί με αυτήν των <emphasis>Υπηρεσιών δικτύου</emphasis> είναι "
 "ορατές μόνο αν έχετε εγκαταστήσει το πακέτο <emphasis>drakwizard</emphasis>. "
 "Μπορείτε να επιλέξετε μεταξύ διαφόρων εργαλείων για την διαμόρφωση των "
-"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref "
-"linkend=\"mcc-networkservices\"/>για να μάθετε περισσότερα."
+"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref linkend=\"mcc-"
+"networkservices\"/>για να μάθετε περισσότερα."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-sharing.xml:19
@@ -8457,12 +8554,11 @@ msgid ""
 "configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject"
 "\" id=\"1\"/> in the system tray."
 msgstr ""
-"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/>"
-"Κέντρο Ελέγχου Mageia και στην καρτέλα "
-"<emphasis role=\"bold\">Διαχείριση λογισμικού</emphasis>. Επίσης είναι "
-"διαθέσιμο με <guimenu>δεξί κλικ / διαμόρφωση ενημερώσεων</guimenu> στο "
-"κόκκινο εικονίδιο <placeholder type=\"inlinemediaobject\" id=\"1\"/> στο "
-"πλαίσιο συστήματος."
+"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/"
+">Κέντρο Ελέγχου Mageia και στην καρτέλα <emphasis role=\"bold\">Διαχείριση "
+"λογισμικού</emphasis>. Επίσης είναι διαθέσιμο με <guimenu>δεξί κλικ / "
+"διαμόρφωση ενημερώσεων</guimenu> στο κόκκινο εικονίδιο <placeholder type="
+"\"inlinemediaobject\" id=\"1\"/> στο πλαίσιο συστήματος."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:27
@@ -8507,8 +8603,8 @@ msgid ""
 "As you must have a mouse to install Mageia, that one is already installed by "
 "Drakinstall. This tool allows installation of another mouse."
 msgstr ""
-"Ένεκα της απαραίτητης χρήσης του ποντικιού για την εγκατάσταση της Mageia, το "
-"Drakinstall έχει φροντίσει για την εγκατάστασή του."
+"Ένεκα της απαραίτητης χρήσης του ποντικιού για την εγκατάσταση της Mageia, "
+"το Drakinstall έχει φροντίσει για την εγκατάστασή του."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:23
@@ -8606,8 +8702,8 @@ msgid ""
 "The first tab takes up the list of the different security tools with a "
 "button on the right side to configure them:"
 msgstr ""
-"Η πρώτη καρτέλα εμφανίζει τον κατάλογο με τα εργαλεία ασφάλειας με ένα κουμπί "
-"στα δεξιά για την διαμόρφωσή τους:"
+"Η πρώτη καρτέλα εμφανίζει τον κατάλογο με τα εργαλεία ασφάλειας με ένα "
+"κουμπί στα δεξιά για την διαμόρφωσή τους:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:54
@@ -8646,8 +8742,8 @@ msgid ""
 "and another button to execute the checks just now."
 msgstr ""
 "την ημερομηνία των τελευταίων περιοδικών ελέγχων και ένα κουμπί για την "
-"προβολή μιας λεπτομερούς αναφοράς και ακόμα ένα κουμπί για την άμεση εκτέλεση "
-"των ελέγχων."
+"προβολή μιας λεπτομερούς αναφοράς και ακόμα ένα κουμπί για την άμεση "
+"εκτέλεση των ελέγχων."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:86
@@ -10310,11 +10406,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Αυτό το εργαλείο<placeholder type=\"footnote\" id=\"0\"/> θα το βρείτε στην "
+"καρτέλα Δίκτυο &amp; Διαδίκτυο στο Κέντρο Ελέγχου Mageia με την ονομασία "
+"«Κέντρο δικτύου»"
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -10987,6 +11087,9 @@ msgstr ""
 "αποδοχή. Σε αυτή την περίπτωση, πρέπει να αποσυνδεθείτε και να "
 "επανασυνδεθείτε για να ενεργοποιηθεί η νέα παραμετροποίηση."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/es.po b/docs/mcc-help/es.po
index 9d3bab19..22abb635 100644
--- a/docs/mcc-help/es.po
+++ b/docs/mcc-help/es.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-31 16:00+0000\n"
 "Last-Translator: motitos\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -871,7 +871,95 @@ msgstr ""
 "y le da instrucciones para ello."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Establecer autologin para iniciar sesión automáticamente"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Puede iniciar esta herramienta desde la línea de comandos, escriba <emphasis "
+"role=\"bold\">drakauth</emphasis> como root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Esta herramienta <placeholder type=\"footnote\" id=\"0\"/>permite iniciar "
+"sesión automáticamente al mismo usuario, en su entorno/escritorio, sin pedir "
+"ninguna contraseña. Se llama autologin. Esto es generalmente buena idea "
+"cuando sólo hay un usuario que use la máquina."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Se encuentra en la pestaña <emphasis role=\"bold\">Arranque</emphasis> del "
+"Centro de Control de Mageia llamada \"Configurar el inicio de sesión "
+"automático\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Los botones son bastante obvios:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Marque <guibutton>Lanzar el entorno gráfico cuando su sistema inicia</"
+"guibutton>, si usted desea que el Sistema X Window sea ejecutado después del "
+"inicio. Si no es así el sistema iniciará en modo texto. De todos modos es "
+"posible lanzar la interfaz gráfica manualmente. Esto puede hacerse "
+"ejecutando el comando  'startx' o 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
+"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
+"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
+"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
+"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
+"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configurar el arranque"
 
@@ -881,23 +969,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Si está usando un ordenador con UEFI, la interfaz de usuario es ligeramente "
 "diferente ya que no se puede elegir el cargador de arranque (el primero de "
 "la lista desplegable) porque solamente hay uno disponible."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -911,9 +1000,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis> como root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -922,16 +1012,17 @@ msgstr ""
 "contraseña, "
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Se encuentra en la solapa Boot en el Centro de Control Mageia, como "
 "\"Configurar el sistema de arranque\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -940,15 +1031,16 @@ msgstr ""
 "Cambiar la configuración puede impedir el arranque de su computadora!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "En la primera parte, llamada <guilabel>Gestor de arranque</guilabel>, es "
 "posible elegir <guibutton>Usar un Gestor de arranque</guibutton>, Grub o "
@@ -961,12 +1053,21 @@ msgstr ""
 "de su computadora."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "En la segunda parte, llamada <guilabel>Opciones principales</guilabel>, "
@@ -978,7 +1079,7 @@ msgstr ""
 "el lapso establecido anteriormente."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -987,19 +1088,19 @@ msgstr ""
 "posible definir una contraseña."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "El botón <guibutton>Avanzadas</guibutton> permite seleccionar algunas otras "
 "opciones."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Activar ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1012,12 +1113,12 @@ msgstr ""
 "hardware es compatible con el estándar ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Activar SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1026,7 +1127,7 @@ msgstr ""
 "procesadores de varios núcleos. "
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1035,7 +1136,7 @@ msgstr ""
 "dual y activará SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1043,7 +1144,7 @@ msgstr ""
 "<guibutton>Habilitar APIC</guibutton> y <guibutton>APIC local:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1065,20 +1166,34 @@ msgstr ""
 "sistema.  En estos casos deshabilite el APIC y/o el LAPIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID de usuario</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "En la <guibutton>Próxima</guibutton> pantalla podrá ver una lista de las "
 "opciones disponibles durante el arranque del sistema.  La opción por defecto "
@@ -1089,13 +1204,13 @@ msgstr ""
 "Grub o modificar las existentes.  Para usar estas herramientas deberá estar "
 "familiarizado con Lilo o Grub."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1105,8 +1220,8 @@ msgstr ""
 "contenido que quiere que aparezca en el menú.  Coincidirá con el comando "
 "\"title\" del Grub.  Por ejemplo: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1114,8 +1229,8 @@ msgstr ""
 "El campo <guilabel>Imágen</guilabel> contiene el nombre del kernel.  "
 "Coincide con el comando \"kernel\" del Grub.  Por ejemplo /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1124,8 +1239,9 @@ msgstr ""
 "se encuentra almacenado el kernel.  Coincide con el comando \"root\" del "
 "Grub.  Por ejemplo (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1133,8 +1249,8 @@ msgstr ""
 "La etiqueta \"Anexar\" contiene las opciones que deben darse al kernel en el "
 "arranque."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1142,8 +1258,8 @@ msgstr ""
 "Si la casilla \"Por defecto\" está marcada, Grub arrancará desde esta "
 "entrada por defecto."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1156,90 +1272,64 @@ msgstr ""
 "y un <guilabel>perfil de red</guilabel>, véase <xref linkend=\"draknetprofile"
 "\"/>, en los menús desplegables."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Establecer autologin para iniciar sesión automáticamente"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID de usuario</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Puede lanzar esta herramienta desde la línea de comandos escribiendo "
-"<emphasis role=\"bold\">drakboot</emphasis> como root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Esta herramienta <placeholder type=\"footnote\" id=\"0\"/>permite iniciar "
-"sesión automáticamente al mismo usuario, en su entorno/escritorio, sin pedir "
-"ninguna contraseña. Se llama autologin. Esto es generalmente buena idea "
-"cuando sólo hay un usuario que use la máquina."
+"En la pantalla extra llamada <guilabel>Avanzado</guilabel>, es posible "
+"elegir el \n"
+" <guilabel>modo de Vídeo</guilabel>, un fichero  <guilabel>initrd</guilabel> "
+"y un <guilabel>perfil de red</guilabel>, véase <xref linkend=\"draknetprofile"
+"\"/>, en los menús desplegables."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Se encuentra en la pestaña <emphasis role=\"bold\">Arranque</emphasis> del "
-"Centro de Control de Mageia llamada \"Configurar el inicio de sesión "
-"automático\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Los botones son bastante obvios:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Marque <guibutton>Lanzar el entorno gráfico cuando su sistema inicia</"
-"guibutton>, si usted desea que el Sistema X Window sea ejecutado después del "
-"inicio. Si no es así el sistema iniciará en modo texto. De todos modos es "
-"posible lanzar la interfaz gráfica manualmente. Esto puede hacerse "
-"ejecutando el comando  'startx' o 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
-"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
-"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
-"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
-"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
-"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
-"guilabel>."
+"Puede lanzar esta herramienta desde la línea de comandos escribiendo "
+"<emphasis role=\"bold\">drakboot</emphasis> como root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2665,22 +2755,22 @@ msgstr ""
 "información al respecto."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Administrar particiones de disco"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk o diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2691,7 +2781,7 @@ msgstr ""
 "\"bold\">diskdrake</emphasis>."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2707,7 +2797,7 @@ msgstr ""
 "continuar."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2716,12 +2806,12 @@ msgstr ""
 "trabajar seleccionando la pestaña correcta (sda, sdb, sdc, etc)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2738,9 +2828,17 @@ msgstr ""
 "inferior es para borrar el disco completo, el resto de botones se hacen "
 "visibles a la derecha después de hacer clic en una partición."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2750,12 +2848,12 @@ msgstr ""
 "partición debe ser desmontada para poder hacer esto."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Solo se puede redimensionar una partición por su lado derecho"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2767,20 +2865,21 @@ msgstr ""
 "\"Crear\" aparece cuando se selecciona una parte vacía del disco."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Usted puede escoger un punto de montaje, si no existe será creado."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Seleccionando \"Cambiar a modo experto\", da algunas acciones adicionales "
@@ -2788,7 +2887,7 @@ msgstr ""
 "siguiente imagen."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7683,13 +7782,14 @@ msgstr "Configurar los pasos del arranque"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10639,10 +10739,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Esta herramienta <placeholder type=\"footnote\" id=\"0\"/> se encuentra bajo "
 "la pestaña <emphasis role=\"bold\">Sistema</emphasis> en el Centro de "
@@ -11454,3 +11555,6 @@ msgstr ""
 "pedirá confirmación. Todavía tendrá tiempo de cancelar todo y mantener la "
 "configuración previas, o aceptar. In este caso, tendrá que desconectarse y "
 "volverse a conectar para activar la nueva configuración."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/et.po b/docs/mcc-help/et.po
index 5a08cdd7..2018cffc 100644
--- a/docs/mcc-help/et.po
+++ b/docs/mcc-help/et.po
@@ -8,7 +8,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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-26 13:03+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -834,7 +834,94 @@ msgstr ""
 "juhul andma ka täpsemat teavet, mida ja kuidas muuta."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Automaatse sisselogimise lubamine"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Tööriista saab käsurealt käivitada, kui anda administraatori õigustes käsk "
+"<emphasis role=\"bold\">drakauth</emphasis>."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Selle tööriistaga<placeholder type=\"footnote\" id=\"0\"/> saab lubada "
+"kasutajal logida oma töökeskkonda sisse, ilma et talt küsitaks parooli. Seda "
+"nimetatakse automaatseks sisselogimiseks (autologin). Ǜldiselt on see päris "
+"hea mõte, kui olete oma masina ainuke kasutaja."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Tööriista leiab Mageia juhtimiskeskuse paneelilt <emphasis role=\"bold"
+"\">Algkäivitus</emphasis>."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Akna valikud on üsna enesestmõistetavad:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Märkige <guibutton>X Windows käivitatakse alglaadimisel</guibutton>, kui "
+"soovite, et graafiline keskkond pandaks tööle kohe pärast alglaadimist. "
+"Vastasel juhul käivitub süsteem tekstirežiimis. Siiski on võimalik "
+"graafilist keskkonda ka käsitsi käivitada. Seda saab teha käsuga 'startx' "
+"või 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Kui esimene valik on märgitud, ilmub veel kaks valikut. Märkige "
+"<guibutton>Ei taha automaatselt siseneda</guibutton>, kui soovite, et "
+"süsteem küsiks endiselt, kes sisse logib (ja tema parooli), või "
+"<guibutton>Jah, soovin automaatset sisselogimist sellele (kasutajale, "
+"keskkonnale)</guibutton>, kui te soovite automaatselt sisse logida. Viimasel "
+"juhul tuleb määrata ka <guilabel>Vaikimisi kasutaja</guilabel> ja "
+"<guilabel>Vaikimisi töölaud</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Süsteemi käivitumise seadistamine"
 
@@ -844,23 +931,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Kui kasutate UEFI süstemi, on kasutajaliides pisut teistsugune, sest te ei "
 "saa valida alglaadurit (esimene hüpikmenüü): sel juhul on saadaval ainult "
 "üks alglaadur."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -874,9 +962,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -885,14 +974,15 @@ msgstr ""
 "süsteem jne.)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr "Tööriista leiab Mageia juhtimiskeskuses paneelilt \"Algkäivitus\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -901,15 +991,16 @@ msgstr ""
 "seadistuse hooletul muutmisel ei pruugi teie masin enam üldse käivituda!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Esimeses sektsioonis <guilabel>Alglaadur</guilabel> saab valida, milline on "
 "<guibutton>eelistatav alglaadur</guibutton>: Grub või LiLo, graafiline või "
@@ -920,12 +1011,21 @@ msgstr ""
 "tähendada, et teie masin enam ei käivitu."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Teises sektsioonis <guilabel>Põhivalikud</guilabel> saab määrata sekundites "
@@ -935,7 +1035,7 @@ msgstr ""
 "alglaadur ooteaja möödumisel vaikimisi süsteemi."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -943,18 +1043,18 @@ msgstr ""
 "Kolmandas sektsioonis <guibutton>Turvalisus</guibutton> saab määrata parooli."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Klõps nupule <guibutton>Muud valikud</guibutton> annab veel mõned valikud."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI lubamine:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -967,12 +1067,12 @@ msgstr ""
 "valik."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP lubamine:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -981,7 +1081,7 @@ msgstr ""
 "protsessorite arhitektuuri."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -990,7 +1090,7 @@ msgstr ""
 "protsessoriks ja lülitab SMP sisse."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -999,7 +1099,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1020,20 +1120,34 @@ msgstr ""
 "kohalik APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Kasutajakonto</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Ekraanil, mis avaneb nupule <guibutton>Edasi</guibutton> klõpsates, näeb "
 "kõiki alglaadimise ajal saadaolevaid kirjeid. Vaikimisi valik on tärniga. "
@@ -1043,13 +1157,13 @@ msgstr ""
 "uue kirje või muuta olemasolevat. Nende võimaluste kasutamiseks peate väga "
 "hästi tundma LiLot või Grubi."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1059,8 +1173,8 @@ msgstr ""
 "meelest peaks olema alglaadimismenüüs näha. See vastab Grubi käsule \"title"
 "\". Näide: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1068,8 +1182,8 @@ msgstr ""
 "Väli <guilabel>Laadefail</guilabel> sisaldab kerneli nime. See vastab Grubi "
 "käsule \"kernel\". Näide: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1077,8 +1191,9 @@ msgstr ""
 "Väli <guilabel>Juurpartitsioon</guilabel> sisaldab seadme nime, kuhu kernel "
 "on salvestatud. See vastab Grubi käsule \"root\". Näide: (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1086,8 +1201,8 @@ msgstr ""
 "Väli <guilabel>Lisaargumendid</guilabel> sisaldab võtmeid, mis antakse "
 "kernelile alglaadimise ajal."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1095,8 +1210,8 @@ msgstr ""
 "Kui märkida kastike <guilabel>Vaikimisi</guilabel>. laadib Grub selle kirje "
 "vaikimisi."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1105,92 +1220,66 @@ msgid ""
 msgstr ""
 "Lisaekraanil, mis avaneb klõpsuga nupule <guilabel>Muud valikud</guilabel>, "
 "saab valida <guilabel>ekraanilahutuse</guilabel>, <guilabel>initrd</"
-"guilabel>-faili ja <guilabel>võrguprofiili</guilabel> (<xref "
-"linkend=\"draknetprofile\"/>)."
-
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Automaatse sisselogimise lubamine"
+"guilabel>-faili ja <guilabel>võrguprofiili</guilabel> (<xref linkend="
+"\"draknetprofile\"/>)."
 
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Kasutajakonto</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Tööriista saab käsurealt käivitada, kui anda administraatori õigustes käsk "
-"<emphasis role=\"bold\">drakboot</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Selle tööriistaga<placeholder type=\"footnote\" id=\"0\"/> saab lubada "
-"kasutajal logida oma töökeskkonda sisse, ilma et talt küsitaks parooli. Seda "
-"nimetatakse automaatseks sisselogimiseks (autologin). Ǜldiselt on see päris "
-"hea mõte, kui olete oma masina ainuke kasutaja."
+"Lisaekraanil, mis avaneb klõpsuga nupule <guilabel>Muud valikud</guilabel>, "
+"saab valida <guilabel>ekraanilahutuse</guilabel>, <guilabel>initrd</"
+"guilabel>-faili ja <guilabel>võrguprofiili</guilabel> (<xref linkend="
+"\"draknetprofile\"/>)."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Tööriista leiab Mageia juhtimiskeskuse paneelilt <emphasis role=\"bold"
-"\">Algkäivitus</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Akna valikud on üsna enesestmõistetavad:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Märkige <guibutton>X Windows käivitatakse alglaadimisel</guibutton>, kui "
-"soovite, et graafiline keskkond pandaks tööle kohe pärast alglaadimist. "
-"Vastasel juhul käivitub süsteem tekstirežiimis. Siiski on võimalik "
-"graafilist keskkonda ka käsitsi käivitada. Seda saab teha käsuga 'startx' "
-"või 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Kui esimene valik on märgitud, ilmub veel kaks valikut. Märkige "
-"<guibutton>Ei taha automaatselt siseneda</guibutton>, kui soovite, et "
-"süsteem küsiks endiselt, kes sisse logib (ja tema parooli), või "
-"<guibutton>Jah, soovin automaatset sisselogimist sellele (kasutajale, "
-"keskkonnale)</guibutton>, kui te soovite automaatselt sisse logida. Viimasel "
-"juhul tuleb määrata ka <guilabel>Vaikimisi kasutaja</guilabel> ja "
-"<guilabel>Vaikimisi töölaud</guilabel>."
+"Tööriista saab käsurealt käivitada, kui anda administraatori õigustes käsk "
+"<emphasis role=\"bold\">drakboot</emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2591,22 +2680,22 @@ msgstr ""
 "hakata, sellele pole vaja rohkem midagi seletadagi."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Kettapartitsioonide haldamine"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk või diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2617,7 +2706,7 @@ msgstr ""
 "\">diskdrake</emphasis>."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2633,7 +2722,7 @@ msgstr ""
 "ikka jätkata."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2642,12 +2731,12 @@ msgstr ""
 "võtta, valida vastava kaardi (sda, sdb, sdc jne.) sakile klõpsates."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2663,9 +2752,17 @@ msgstr ""
 "kõik</guibutton></emphasis> saab tühjendada kogu ketta, teised nupud tulevad "
 "paremal nähtavale, kui olete klõpsanud partitsioonile."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2675,12 +2772,12 @@ msgstr ""
 "partitsioon esmalt lahutada."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Partitsiooni suurust saab muuta ainult selle paremal pool ehk lõpus."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2692,22 +2789,23 @@ msgstr ""
 "\">Tekita</guibutton> ilmub nähtavale, kui valida ketta tühi osa."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Kui soovite, võite valida ka haakepunkti, mida ei ole olemas. Sellisel juhul "
 "see haakepunkt luuakse."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Klõps nupule <emphasis><guibutton>Lülitu ekspertrežiimi</guibutton></"
@@ -2715,7 +2813,7 @@ msgstr ""
 "partitsioonile nime anda. Neid valikuid näeb alloleval pildil."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7543,13 +7641,14 @@ msgstr "Algkäivituse seadistamine"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10446,10 +10545,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Selle tööriista<placeholder type=\"footnote\" id=\"0\"/> leiab Mageia "
 "juhtimiskeskuses paneelilt <emphasis role=\"bold\">Süsteem</emphasis> kirje "
@@ -11244,6 +11344,9 @@ msgstr ""
 "jätkata endise seadistusega või siis need lõplikult kinnitada. Viimasel "
 "juhul tuleb uue seadistuse aktiveerimiseks graafiline keskkond taaskäivitada."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/eu.po b/docs/mcc-help/eu.po
index df5169ba..e3dfc475 100644
--- a/docs/mcc-help/eu.po
+++ b/docs/mcc-help/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-25 18:32+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
@@ -840,7 +840,100 @@ msgstr ""
 "eta jarraian hori egiteko argibideak ematen badizkizu."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Gaitu saio hasiera automatikoa saioa automatikoki hasi dadin"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Komando-lerrotik tresna hau abiaraz dezakezu, <emphasis role=\"bold"
+"\">drakauth</emphasis> root bezala idatziz."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Tresna hau<placeholder type=\"footnote\" id=\"0\"/> zure ingurune/"
+"mahaigainean erabiltzaile berari automatikoki konektatzeko aukera ematen "
+"dio, edozein pasahitz eskatu gabe. Autologin izenekoa. Hau ideia ona izan "
+"ohi da, han makina erabiltzeko erabiltzaile bakar bat badago."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Mageia Kontrol Guneko <emphasis role=\"bold\">Abio</emphasis> erlaitzean "
+"kokatuta \"Saio-hasiera automatikoa itxuratzea\" deiturik."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Interfaze botoiak nahiko bistakoak dira:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Egiaztatu <guibutton>Abiarazi ingurune grafikoa zure sistema abiaraztean</"
+"guibutton>, X Window Sistema hasi ondoren exekutatzea nahi izanez gero. "
+"Horrela ez bada sistema testu moduan hasiko da. Dena den, posible da GUI-a "
+"eskuz abiaraztea. Hau 'startx' edo 'systemctl start dm' komandoa exekutatzen "
+"egin daiteke."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
+"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
+"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
+"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
+"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
+"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
+"guilabel>.Lehengo laukia aktibatuta baldin badago, beste bi aukera agertuko "
+"dira. Markatu <guibutton>Ez, nik ez dut autologin-ik nahi</guibutton>, "
+"sistemak erabiltzailea eta pasahitza eskatzea nahi baduzu, edo "
+"<guibutton>Bai, (erabiltzaile, idazmahai) honekin automatikoki sartzea nahi "
+"dut</guibutton>, beharrezkoa bada. Horrelakoetan, <guilabel>lehenetsitako "
+"erabiltzaile izena</guilabel> hornitzea behar duzu baita "
+"<guilabel>lehenetsitako idazmahaia</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Ezarri abio sistema"
 
@@ -850,23 +943,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Zuk UEFI sistema bat erabiltzen ari bazara, erabiltzaile interfazearen "
 "zertxobait ezberdina da, ezin duzu abiarazlea aukeratu (lehen goitibeherako "
 "menua) ez baitago erabilgarri besterik."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -880,9 +974,10 @@ msgstr ""
 "\">drakboot --boot</emphasis> root bezala idatziz."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -891,16 +986,17 @@ msgstr ""
 "definitzea, lehenetsitako abioa, etab.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Mageia Kontrol Gunean \"Konfiguratu abio sistema\" etiketa pean aurkitu da "
 "Abioa."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -909,15 +1005,16 @@ msgstr ""
 "Konfigurazio aldatzeak zure konputagailuaren abioa galaraz dezake!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Lehenengo zatian, <guilabel>abioko kudeatzailea</guilabel> izenekoa, "
 "aukeratu dezakezu <guibutton>abioko kargatzailea Kudeatzaile bat erabiltzea</"
@@ -929,12 +1026,21 @@ msgstr ""
 "ordenagailua abiaraztea sahiestu dezake."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "En la segunda parte, llamada <guilabel>Opciones principales</guilabel>, "
@@ -952,7 +1058,7 @@ msgstr ""
 "ezarritako epea amaitu ondoren."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -961,19 +1067,19 @@ msgstr ""
 "deiturikoa, pasahitz bat definitzea posiblea da."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Botoi <guibutton>Aurreratuak</guibutton>  beste aukera batzuk aukeratzea "
 "baimentzen du."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Gaitu ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -986,12 +1092,12 @@ msgstr ""
 "zure hardwarea ACPI estandarrarekin bateragarria bada."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Gaitu SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1000,7 +1106,7 @@ msgstr ""
 "prozesadoreetarako arkitektura da."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1009,7 +1115,7 @@ msgstr ""
 "bezala ikusiko du eta SMP-a aktibatuko du."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1018,7 +1124,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1039,20 +1145,34 @@ msgstr ""
 "APIC lokal desaktibatu."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Saioa hastko ID-a</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "En la <guibutton>Próxima</guibutton> pantalla podrá ver una lista de las "
 "opciones disponibles durante el arranque del sistema.  La opción por defecto "
@@ -1069,13 +1189,13 @@ msgstr ""
 "bat agertuko da Grub-en menuan sarrerak gehitzeko edo daudenak aldatzeko "
 "aukera emanez. "
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1085,8 +1205,8 @@ msgstr ""
 "menuan agertzea nahi duzun edukia. Grub \"title\"  komandoarekin bat  dator. "
 "Adibidez: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1094,8 +1214,8 @@ msgstr ""
 "<guilabel>Irudi</guilabel> eremuak nukleoa gordetzen duen gailuaren izena "
 "dauka. Grub-en \"kernel\"  komandoarekin bat dator. Adibidez  /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1103,16 +1223,17 @@ msgstr ""
 "<guilabel>Root</guilabel> eremuak nukleoa gordetzen duen gailuaren izena "
 "dauka. Grub-en \"root\" komandoarekin bat dator. Adibidez (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
 msgstr ""
 "\"Eranstea\" etiketak kernel-ari abioan eman behar zaizkion aukerak dauzka."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1120,8 +1241,8 @@ msgstr ""
 "\"lehenetsia\" Kutxa hautatuta badago, GRUB sarrera hau hasieratuko du modu "
 "lehenetsian."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1133,95 +1254,63 @@ msgstr ""
 "guilabel> fitxategia bat eta <guilabel>sare-profila</guilabel>, ikus <xref "
 "linkend=\"draknetprofile\"/>, goitibeherako zerrendetan."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Gaitu saio hasiera automatikoa saioa automatikoki hasi dadin"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Saioa hastko ID-a</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Komando-lerrotik tresna hau abiaraz dezakezu, <emphasis role=\"bold"
-"\">drakboot</emphasis> root bezala idatziz."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Tresna hau<placeholder type=\"footnote\" id=\"0\"/> zure ingurune/"
-"mahaigainean erabiltzaile berari automatikoki konektatzeko aukera ematen "
-"dio, edozein pasahitz eskatu gabe. Autologin izenekoa. Hau ideia ona izan "
-"ohi da, han makina erabiltzeko erabiltzaile bakar bat badago."
+"<guilabel>Aurreratua</guilabel> izeneko aparteko pantailan, posible da "
+"<guilabel>Bideo-modua</guilabel> aukeratu ahal izatea, <guilabel>initrd</"
+"guilabel> fitxategia bat eta <guilabel>sare-profila</guilabel>, ikus <xref "
+"linkend=\"draknetprofile\"/>, goitibeherako zerrendetan."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Mageia Kontrol Guneko <emphasis role=\"bold\">Abio</emphasis> erlaitzean "
-"kokatuta \"Saio-hasiera automatikoa itxuratzea\" deiturik."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Interfaze botoiak nahiko bistakoak dira:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Egiaztatu <guibutton>Abiarazi ingurune grafikoa zure sistema abiaraztean</"
-"guibutton>, X Window Sistema hasi ondoren exekutatzea nahi izanez gero. "
-"Horrela ez bada sistema testu moduan hasiko da. Dena den, posible da GUI-a "
-"eskuz abiaraztea. Hau 'startx' edo 'systemctl start dm' komandoa exekutatzen "
-"egin daiteke."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
-"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
-"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
-"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
-"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
-"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
-"guilabel>.Lehengo laukia aktibatuta baldin badago, beste bi aukera agertuko "
-"dira. Markatu <guibutton>Ez, nik ez dut autologin-ik nahi</guibutton>, "
-"sistemak erabiltzailea eta pasahitza eskatzea nahi baduzu, edo "
-"<guibutton>Bai, (erabiltzaile, idazmahai) honekin automatikoki sartzea nahi "
-"dut</guibutton>, beharrezkoa bada. Horrelakoetan, <guilabel>lehenetsitako "
-"erabiltzaile izena</guilabel> hornitzea behar duzu baita "
-"<guilabel>lehenetsitako idazmahaia</guilabel>."
+"Komando-lerrotik tresna hau abiaraz dezakezu, <emphasis role=\"bold"
+"\">drakboot</emphasis> root bezala idatziz."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2638,22 +2727,22 @@ msgstr ""
 "informazio gehiago behar duzunik."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Kudeatu disko partizioak"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk edo diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2664,7 +2753,7 @@ msgstr ""
 "bezala idatziz."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2680,7 +2769,7 @@ msgstr ""
 "seguru ez bazaude."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2689,12 +2778,12 @@ msgstr ""
 "gogorrera aldatu zaitezke fitxa zuzena aukeratuz (sda, sdb, sdc etab)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2711,9 +2800,17 @@ msgstr ""
 "ezabatzeko da, gainerako botoiak eskuinean egiten dira ikusgai  partizio "
 "batean klik egin ondoren."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2723,12 +2820,12 @@ msgstr ""
 "desmuntatua izan behar da hori egin ahal izateko."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Soilik posible da partizio tamaina aldatzea bere eskuinaldean"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2741,22 +2838,23 @@ msgstr ""
 "dagoenean"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Existitzen ez den muntai puntu bat aukeratu ahal izango baduzu, sortu egingo "
 "da."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
@@ -2764,7 +2862,7 @@ msgstr ""
 "seen in the screenshot below."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7632,13 +7730,14 @@ msgstr "Konfiguratu abioaren urratsak"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10561,10 +10660,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Tresna hau<placeholder type=\"footnote\" id=\"0\"/> <emphasis role=\"bold"
 "\">Sistema</emphasis> fitxa azpian aurkitzen da Mageia Kontrol Gunean "
@@ -11371,3 +11471,6 @@ msgstr ""
 "baieztatzeko eskatuko dizu. Denbora dago guztia bertan behera uzteko eta "
 "aurreko konfigurazioa mantentzeko, edo onartzeko. Kasu honetan, deskonektatu "
 "eta berriz ere konektatu behar duzu Konfigurazio berria gaitzeko."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/fr.po b/docs/mcc-help/fr.po
index f8845fd9..5e3f3926 100644
--- a/docs/mcc-help/fr.po
+++ b/docs/mcc-help/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-24 14:29+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -864,7 +864,96 @@ msgstr ""
 "système invite à le faire et donne les informations nécessaires à ce sujet."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Configurer la connexion automatique"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Il est possible de lancer cet outil depuis la ligne de commande en tapant "
+"sous root : <emphasis role=\"bold\">drakauth</emphasis>."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Cet outil<placeholder type=\"footnote\" id=\"0\"/> permet de connecter "
+"automatiquement à chaque démarrage un utilisateur particulier, dans son "
+"environnement de bureau, sans lui demander son mot de passe. Cela s'appelle "
+"la connexion automatique. C'est généralement une bonne idée sur une machine "
+"qui ne possède qu'un seul utilisateur."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Il se trouve dans l'onglet <emphasis role=\"bold\">Démarrage</emphasis> du "
+"Centre de Contrôle de Mageia, sous l'appellation \"Configurer la connexion "
+"automatique\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Les boutons de l'interface sont assez évidents :"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Cochez <guibutton>Lancer l'environnement graphique au démarrage du système</"
+"guibutton>, si vous désirez que le serveur graphique soit exécuté au "
+"démarrage. Dans le cas contraire, le système démarrera en mode texte. "
+"Cependant il sera toujours possible de lancer l'interface graphique "
+"manuellement, en exécutant la commande 'startx' ou 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la première case est cochée, deux autres options sont disponibles, cocher "
+"soit <guibutton> Ne pas connecter automatiquement un utilisateur</"
+"guibutton>, pour que le système continue à demander quel utilisateur "
+"connecter (avec le mot de passe) ou bien cocher <guibutton> Connexion "
+"automatique (choisir utilisateur et bureau)</guibutton>. Dans ce cas, il est "
+"aussi nécessaire de fournir le nom de l'<guilabel>Utilisateur par défaut</"
+"guilabel> et le <guilabel>Bureau par défaut</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configurer le démarrage du système"
 
@@ -874,23 +963,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Si vous utilisez un système UEFI, l'interface utilisateur est légèrement "
 "différente. En effet vous ne pouvez pas choisir le chargeur de démarrage "
 "(première liste déroulante) car un seul est disponible."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -904,9 +994,10 @@ msgstr ""
 "sous root : <emphasis role=\"bold\">drakboot--boot</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -915,16 +1006,17 @@ msgstr ""
 "passe, l'amorçage par défaut etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "On le trouve dans l'onglet Démarrage du Centre de Contrôle de Mageia, sous "
 "la désignation \"Configurer le démarrage du système\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -933,15 +1025,16 @@ msgstr ""
 "modification de certains éléments peut interdire tout nouvel amorçage !"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Dans la première partie, appelée <guilabel>Programme d'amorçage</guilabel>, "
 "il est possible de choisir quel <guibutton>Programme d'amorçage à utiliser</"
@@ -953,12 +1046,21 @@ msgstr ""
 "interdire l'amorçage de la machine."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Dans la seconde partie, appelée <guilabel>Options principales</guilabel>,se "
@@ -969,7 +1071,7 @@ msgstr ""
 "défaut qui sera amorcée une fois le délai expiré."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -978,18 +1080,18 @@ msgstr ""
 "autorise la mise en place d'un mot de passe."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Le bouton <guibutton>Avancé</guibutton> propose des options supplémentaires."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Activer l'ACPI :</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1002,12 +1104,12 @@ msgstr ""
 "Cocher cette case si le matériel est compatible ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Activer le SMP :</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1016,7 +1118,7 @@ msgstr ""
 "processeurs multicores."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1025,7 +1127,7 @@ msgstr ""
 "des processeurs dual core et active le SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1034,7 +1136,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1056,20 +1158,34 @@ msgstr ""
 "l'APIC local."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Identifiant de connexion</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Dans l'écran <guibutton>Suivant</guibutton>, se trouve la liste de toutes "
 "les entrées du menu d'amorçage, celle par défaut est repérée par un "
@@ -1080,13 +1196,13 @@ msgstr ""
 "le menu d'amorçage ou la modification d'une entrée existante. Il faut bien "
 "connaître Lilo ou Grub pour être capable d'utiliser ces outils."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1096,8 +1212,8 @@ msgstr ""
 "souhaite voir affiché dans le menu. Il correspond à la commande \"title\" de "
 "grub. Par exemple : Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1105,8 +1221,8 @@ msgstr ""
 "Le champ <guilabel>Image</guilabel> contient le nom du noyau. Il correspond "
 "à la commande \"kernel\" de Grub. Par exemple /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1115,8 +1231,9 @@ msgstr ""
 "périphérique où est enregistré le noyau. Il correspond à la commande \"root"
 "\".  Par exemple : (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1124,8 +1241,8 @@ msgstr ""
 "Le champ<guilabel> Options passées au noyau</guilabel> contient les options "
 "à passer au noyau pendant l'amorçage."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1133,8 +1250,8 @@ msgstr ""
 "Si la case <guilabel>Choix par défaut</guilabel> est cochée, Grub amorcera "
 "cette entrée par défaut."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1146,91 +1263,63 @@ msgstr ""
 "<guilabel>initrd</guilabel> et un <guilabel>profil réseau</guilabel> "
 "(consulter <xref linkend=\"draknetprofile\"/>), dans les listes déroulantes."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Configurer la connexion automatique"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Identifiant de connexion</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Il est possible de lancer cet outil depuis la ligne de commande en tapant "
-"sous root : <emphasis role=\"bold\">drakboot</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Cet outil<placeholder type=\"footnote\" id=\"0\"/> permet de connecter "
-"automatiquement à chaque démarrage un utilisateur particulier, dans son "
-"environnement de bureau, sans lui demander son mot de passe. Cela s'appelle "
-"la connexion automatique. C'est généralement une bonne idée sur une machine "
-"qui ne possède qu'un seul utilisateur."
+"Dans l'écran supplémentaire appelé <guilabel>Avancé</guilabel>, il est "
+"possible de choisir le <guilabel>mode Vidéo</guilabel>, un fichier "
+"<guilabel>initrd</guilabel> et un <guilabel>profil réseau</guilabel> "
+"(consulter <xref linkend=\"draknetprofile\"/>), dans les listes déroulantes."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Il se trouve dans l'onglet <emphasis role=\"bold\">Démarrage</emphasis> du "
-"Centre de Contrôle de Mageia, sous l'appellation \"Configurer la connexion "
-"automatique\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Les boutons de l'interface sont assez évidents :"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Cochez <guibutton>Lancer l'environnement graphique au démarrage du système</"
-"guibutton>, si vous désirez que le serveur graphique soit exécuté au "
-"démarrage. Dans le cas contraire, le système démarrera en mode texte. "
-"Cependant il sera toujours possible de lancer l'interface graphique "
-"manuellement, en exécutant la commande 'startx' ou 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la première case est cochée, deux autres options sont disponibles, cocher "
-"soit <guibutton> Ne pas connecter automatiquement un utilisateur</"
-"guibutton>, pour que le système continue à demander quel utilisateur "
-"connecter (avec le mot de passe) ou bien cocher <guibutton> Connexion "
-"automatique (choisir utilisateur et bureau)</guibutton>. Dans ce cas, il est "
-"aussi nécessaire de fournir le nom de l'<guilabel>Utilisateur par défaut</"
-"guilabel> et le <guilabel>Bureau par défaut</guilabel>."
+"Il est possible de lancer cet outil depuis la ligne de commande en tapant "
+"sous root : <emphasis role=\"bold\">drakboot</emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2672,22 +2761,22 @@ msgstr ""
 "besoin de plus d'informations à ce sujet."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gérer les partitions de vos disques durs"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk or diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2698,7 +2787,7 @@ msgstr ""
 "\"bold\">diskdrake</emphasis>."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2714,7 +2803,7 @@ msgstr ""
 "confiant pour la suite."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2724,12 +2813,12 @@ msgstr ""
 "sdc, etc.)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2746,9 +2835,17 @@ msgstr ""
 "emphasis> en bas sert à effacer la totalité du disque, les autres boutons "
 "deviennent visibles sur la droite dès qu'une partition est sélectionnée."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2758,13 +2855,13 @@ msgstr ""
 "Pour pouvoir le faire, il faut d'abord la démonter."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Le redimensionnement d'une partition n'est possible que vers sa droite."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2777,22 +2874,23 @@ msgstr ""
 "du disque est sélectionnée."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Il est possible de choisir un point de montage qui n'existe pas, il sera "
 "créé."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Sélectionner <emphasis><guibutton> Passer en mode expert </guibutton></"
@@ -2801,7 +2899,7 @@ msgstr ""
 "d'écran ci-dessous."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7727,13 +7825,14 @@ msgstr "Configurer les étapes du démarrage"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10692,10 +10791,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Cet outil <placeholder type=\"footnote\" id=\"0\"/> se trouve dans l'onglet "
 "<emphasis role=\"bold\">Système</emphasis> du Centre de Contrôle de Mageia "
@@ -11510,3 +11610,6 @@ msgstr ""
 "la configuration précédente, ou acceptez la modification. Dans ce dernier "
 "cas, vous devrez vous déconnecter et vous reconnecter pour activer la "
 "nouvelle configuration."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/id.po b/docs/mcc-help/id.po
index 962be6fb..b0f2d460 100644
--- a/docs/mcc-help/id.po
+++ b/docs/mcc-help/id.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-25 04:40+0000\n"
 "Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -840,7 +840,95 @@ msgstr ""
 "melakukannya dan berikan informasi tetangnya."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Mengatur autologin untuk masuk otomatis"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Anda bisa menjalankan alat ini dari baris perintah, dengan mengetik "
+"<emphasis role=\"bold\">drakauth</emphasis> sebagai root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Alat ini<placeholder type=\"footnote\" id=\"0\"/> memungkinkan Anda untuk "
+"masuk otomatis dengan pengguna yang sama, ke lingkungan desktop, tanpa "
+"ditanya sandi apapun. Ini disebut autologin.  Ini bagus ketika hanya ada "
+"satu pengguna di komputer."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Ini ada di tab <emphasis role=\"bold\">Boot</emphasis> pada Pusat Kendali "
+"Mageia dengan nama \"Atur autologin untuk masuk otomatis\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Tombol antarmuka sangat jelas:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Centang <guibutton>Jalankan lingkungan grafis ketika sistem dimulai</"
+"guibutton>, jika Anda ingin Sistem X Window dijalankan setelah komputer "
+"dinyalakan. Jika tidak, sistem akan dimulai dalam mode teks. Meski demikian, "
+"akan tetap mungkin untuk menjalankan antarmuka grafis secara manual. Ini "
+"bisa dilakukan dengan menjalankan perintah 'startx' atau 'systemctl start "
+"dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Jika kotak pertama ditandai, dua pilihan lainnya akan tersedia, tandai "
+"antara <guibutton>Tidak, saya tidak ingin autologin</guibutton>, jika Anda "
+"ingin sistem terus menanyakan pengguna mana yang ingin terhubung (dan sandi) "
+"atau tandai <guibutton>Ya, saya ingin autologin dengan (pengguna, desktop) "
+"ini</guibutton>, jika diperlukan. Untuk yang ini, Anda juga harus menentukan "
+"<guilabel>Nama pengguna baku</guilabel> dan <guilabel>Desktop baku</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Mengatur sistem boot"
 
@@ -850,23 +938,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Jika Anda menggunakan sistem UEFI, antarmuka pengguna akan sangat berbeda "
 "karena Anda tidak bisa memilih boot loader (daftar tarik ulur pertama) "
 "karena hanya satu yang tersedia."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -880,9 +969,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis> sebagai root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -891,16 +981,17 @@ msgstr ""
 "dll.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Ini ada di tab Boot pada Pusat Kendali Mageia dengan nama \"Atur sistem boot"
 "\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -909,15 +1000,16 @@ msgstr ""
 "beberapa pengaturan bisa mencegah komputer untuk berjalan!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Di bagian pertama, disebut <guilabel>Bootloader</guilabel>, sangat "
 "dimungkinkan untuk memilih <guibutton>Bootloader yang digunakan</guibutton>, "
@@ -928,12 +1020,21 @@ msgstr ""
 "saja mencegah komputer untuk berjalan."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Bagian kedua, disebut <guilabel>Pilihan utama</guilabel>, Anda bisa mengatur "
@@ -943,7 +1044,7 @@ msgstr ""
 "akan menjalankan sistem baku setelah waktu jeda terlewati."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -952,18 +1053,18 @@ msgstr ""
 "bisa mengatur sandi."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Tombol <guibutton>Lanjutan</guibutton> memberikan beberapa pilihan tambahan."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Hidupkan ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -976,12 +1077,12 @@ msgstr ""
 "ini jika hardware Anda cocok dengan ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Hidupkan SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -990,7 +1091,7 @@ msgstr ""
 "prosesor dengan banyak inti."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -999,7 +1100,7 @@ msgstr ""
 "sebagai dual processor dan menghidupkan SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1008,7 +1109,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1029,20 +1130,34 @@ msgstr ""
 "ini, matikan APIC dan/atau Local APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID Login</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Di layar <guibutton>Selanjutnya</guibutton>, Anda bisa melihat semua daftar "
 "entri yang tersedia saat komputer dijalankan. Pilihan baku adalah yang "
@@ -1053,13 +1168,13 @@ msgstr ""
 "memodifikasi yang sudah ada. Anda harus mengenal Lilo atau Grub untuk "
 "menggunakan peralatan ini."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1069,8 +1184,8 @@ msgstr ""
 "ditampilkan di menu. Ini sama dengan perintah Grub \"title\". Contohnya: "
 "Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1078,8 +1193,8 @@ msgstr ""
 "Kolom <guilabel>Image</guilabel> berisi nama kernel. Ini sama dengan "
 "perintah Grub \"kernel\". Contohnya /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1087,8 +1202,9 @@ msgstr ""
 "Kolom <guilabel>Root</guilabel> berisi nama perangkat di mana kernel "
 "tersimpan. Ini sama dengan perintah Grub \"root\". Contohnya (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1096,8 +1212,8 @@ msgstr ""
 "Kolom <guilabel>Tambahan</guilabel> berisi pilihan yang diberikan ke kernel "
 "saat komputer dijalankan."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1105,8 +1221,8 @@ msgstr ""
 "Jika kotak <guilabel>Baku</guilabel> ditandai, Grub akan menjalankan entri "
 "ini sebagai pilihan baku."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1118,90 +1234,63 @@ msgstr ""
 "guilabel> dan <guilabel>profil jaringan</guilabel>, lihat <xref linkend="
 "\"draknetprofile\"/> dalam daftar tarik ulur."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Mengatur autologin untuk masuk otomatis"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID Login</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Anda bisa menjalankan alat ini dari baris perintah, dengan mengetik "
-"<emphasis role=\"bold\">drakboot</emphasis> sebagai root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Alat ini<placeholder type=\"footnote\" id=\"0\"/> memungkinkan Anda untuk "
-"masuk otomatis dengan pengguna yang sama, ke lingkungan desktop, tanpa "
-"ditanya sandi apapun. Ini disebut autologin.  Ini bagus ketika hanya ada "
-"satu pengguna di komputer."
+"Dalam layar tambahan yang disebut <guilabel>Lanjutan</guilabel> dimungkinkan "
+"untuk memilih <guilabel>mode Video</guilabel>, file <guilabel>initrd</"
+"guilabel> dan <guilabel>profil jaringan</guilabel>, lihat <xref linkend="
+"\"draknetprofile\"/> dalam daftar tarik ulur."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Ini ada di tab <emphasis role=\"bold\">Boot</emphasis> pada Pusat Kendali "
-"Mageia dengan nama \"Atur autologin untuk masuk otomatis\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Tombol antarmuka sangat jelas:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Centang <guibutton>Jalankan lingkungan grafis ketika sistem dimulai</"
-"guibutton>, jika Anda ingin Sistem X Window dijalankan setelah komputer "
-"dinyalakan. Jika tidak, sistem akan dimulai dalam mode teks. Meski demikian, "
-"akan tetap mungkin untuk menjalankan antarmuka grafis secara manual. Ini "
-"bisa dilakukan dengan menjalankan perintah 'startx' atau 'systemctl start "
-"dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Jika kotak pertama ditandai, dua pilihan lainnya akan tersedia, tandai "
-"antara <guibutton>Tidak, saya tidak ingin autologin</guibutton>, jika Anda "
-"ingin sistem terus menanyakan pengguna mana yang ingin terhubung (dan sandi) "
-"atau tandai <guibutton>Ya, saya ingin autologin dengan (pengguna, desktop) "
-"ini</guibutton>, jika diperlukan. Untuk yang ini, Anda juga harus menentukan "
-"<guilabel>Nama pengguna baku</guilabel> dan <guilabel>Desktop baku</"
-"guilabel>."
+"Anda bisa menjalankan alat ini dari baris perintah, dengan mengetik "
+"<emphasis role=\"bold\">drakboot</emphasis> sebagai root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2607,22 +2696,22 @@ msgstr ""
 "lebih untuk ini."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Kelola partisi disk"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk atau diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2633,7 +2722,7 @@ msgstr ""
 "\">diskdrake</emphasis> sebagai root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2648,7 +2737,7 @@ msgstr ""
 "emphasis> jika Anda tidak ingin melanjutkan."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2657,12 +2746,12 @@ msgstr ""
 "disk yang Anda inginkan dengan memilih tab yang benar (sda, sdb, sdc, dst)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2679,9 +2768,17 @@ msgstr ""
 "tombol lainnya akan muncul di sebelah kanan setelah Anda mengklik sebuah "
 "partisi."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2691,12 +2788,12 @@ msgstr ""
 "semua itu, partisi harus dilepas terlebih dahulu."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Mengubah ukuran hanya bisa pada sisi sebelah kanan partisi"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2708,21 +2805,22 @@ msgstr ""
 "role=\"bold\">Buat</guibutton> muncul ketika bagian disk kosong dipilih"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Anda bisa memilih titik mount yang belum ada yang kemudian akan dibuatkan."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Memilih <emphasis><guibutton>Beralih ke mode ahli</guibutton></emphasis> "
@@ -2730,7 +2828,7 @@ msgstr ""
 "seperti yang bisa dilihat pada gambar di bawah."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7562,13 +7660,14 @@ msgstr "Konfigurasi langkah boot"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10470,10 +10569,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Alat ini<placeholder type=\"footnote\" id=\"0\"/> ada di tab <emphasis role="
 "\"bold\">Sistem</emphasis> pada Pusat Kendali Mageia dengan nama "
@@ -11262,3 +11362,6 @@ msgstr ""
 "kepada Anda untuk mengkonfirmasi. Masih ada waktu untuk membatalkan semua "
 "dan menjaga konfigurasi sebelumnya, atau menerimanya. Dalam hal ini, Anda "
 "harus memutuskan dan menyambungkan ulang untuk mengaktifkan konfigurasi baru."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/it.po b/docs/mcc-help/it.po
index 480724f0..0d1f6761 100644
--- a/docs/mcc-help/it.po
+++ b/docs/mcc-help/it.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-12 20:32+0000\n"
 "Last-Translator: Roberto Albano <randyichinose@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
@@ -783,7 +783,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Imposta l'accesso automatico"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Puoi avviare questo tool da linea di comando scrivendo <emphasis role=\"bold"
+"\">drakconnect</emphasis> come root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "I bottoni di interfaccia sono piuttosto semplici:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configura l'avvio del sistema"
 
@@ -793,20 +862,20 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -818,22 +887,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
+"Questo strumento<placeholder type=\"footnote\" id=\"0\"/> ti permette di "
+"accedere alla console che viene automaticamente aperta come root. Non "
+"pensiamo che tu debba sapere altro al riguardo."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
+"Si trova nel Centro di Controllo di Mageia, nella scheda Dischi Locali, "
+"etichettata \"Condividi le partizioni del disco fisso\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -843,46 +919,54 @@ msgstr ""
 "boot!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+msgid ""
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -891,12 +975,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Abilita SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -905,7 +989,7 @@ msgstr ""
 "multicore."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -914,14 +998,14 @@ msgstr ""
 "dual e abiliterà SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -934,65 +1018,79 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID di accesso</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+msgid ""
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
 "example: Mageia3."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1000,68 +1098,55 @@ msgid ""
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Imposta l'accesso automatico"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID di accesso</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "I bottoni di interfaccia sono piuttosto semplici:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2301,22 +2386,22 @@ msgstr ""
 "pensiamo che tu debba sapere altro al riguardo."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gestisci le partizioni del disco"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk o diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2327,7 +2412,7 @@ msgstr ""
 "\">diskdrake</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2337,19 +2422,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2359,21 +2444,29 @@ msgid ""
 "the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2382,25 +2475,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Puoi scegliere un punto di mount inesistente, verrà creato."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6453,13 +6546,14 @@ msgstr "Configura la sequenza di avvio"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -8877,11 +8971,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Questo strumento<placeholder type=\"footnote\" id=\"0\"/> lo trovi nel "
+"Centro di Controllo di Mageia, nel tab Condivisioni di rete, etichettato "
+"<guilabel>Configura condivisioni WebDAV</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -9520,3 +9618,6 @@ msgid ""
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
 msgstr ""
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/nl.po b/docs/mcc-help/nl.po
index a86de8ce..c64efe13 100644
--- a/docs/mcc-help/nl.po
+++ b/docs/mcc-help/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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-09-16 16:40+0200\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -842,7 +842,94 @@ msgstr ""
 "en er informatie over geeft."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Automatische aanmelding instellen"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
+"\"bold\">drakauth</emphasis> te typen."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Deze tool<placeholder type=\"footnote\" id=\"0\"/> laat één gebruiker "
+"automatisch inloggen op zijn/haar werkomgeving, zonder een wachtwoord te "
+"hoeven geven. Dat heet autologin.  Dit kan een goed idee zijn als het "
+"systeem slechts door één persoon gebruikt wordt."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"U vindt hem in het <emphasis role=\"bold\">Opstarten</emphasis>-tabblad van "
+"het Mageia-configuratiecentrum, het heet \"Automatische aanmelding instellen"
+"\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "De knoppen van de interface spreken voor zich:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Vink <guibutton>Open het X-Windowsysteem bij opstarten</guibutton> aan, als "
+"u wilt dat het X-Windowsysteem bij het opstarten wordt uitgevoerd. Zo niet, "
+"dan start de computer in tekstmodus. Overigens kan de grafische omgeving dan "
+"handmatig gestart worden, met het commando 'startx' of 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Als het eerste hokje is aangevinkt, zijn er nog twee opties beschikbaar. "
+"Vink <guibutton>Nee, ik wil niet automatisch aanmelden</guibutton> aan, als "
+"u een inlogscherm wilt krijgen waarin om gebruiker en wachtwoord gevraagd "
+"wordt. Kies anders <guibutton>Ja, ik wil automatisch aanmelden met deze "
+"(gebruiker, werkomgeving)</guibutton>. In dat geval dient u ook de "
+"<guilabel>Standaard gebruiker</guilabel> en <guilabel>Standaard "
+"werkomgeving</guilabel> te kiezen."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Stel het opstartsysteem in"
 
@@ -852,23 +939,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Als u een UEFI-systeem heeft, ziet dit scherm er iets anders uit. De "
 "uitvouwlijst om een opstartlader te kiezen ontbreekt, omdat er slechts één "
 "beschikbaar is."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -882,9 +970,10 @@ msgstr ""
 "\"bold\">drakboot --boot</emphasis> te typen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -893,16 +982,17 @@ msgstr ""
 "opstartstandaard enz.) te configuren."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Het bevindt zich in het Opstarten-tabblad in het Mageia-configuratiecentrum "
 "en heet \"Opstartsysteem instellen\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -911,15 +1001,16 @@ msgstr ""
 "van sommige instellingen kan verhinderen dat uw machine weer opstart!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "In het eerste deel, <guilabel>Opstartlader</guilabel>, kunt u kiezen welke "
 "<guibutton>opstartlader te gebruiken</guibutton>, GRUB, GRUB2, of LILO, en "
@@ -930,12 +1021,21 @@ msgstr ""
 "het opstarten van uw machine onmogelijk maken."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "In het tweede deel, <guilabel>Hoofdopties</guilabel>, kunt u de "
@@ -946,7 +1046,7 @@ msgstr ""
 "zodra de wachttijd verstreken is."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -955,17 +1055,17 @@ msgstr ""
 "wachwoord instellen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "De <guibutton>Geavanceerd</guibutton>knop geeft wat extra opties."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI inschakelen</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -978,12 +1078,12 @@ msgstr ""
 "als u ACPI-compatibele apparaten heeft. "
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP inschakelen</guibutton>:"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -992,7 +1092,7 @@ msgstr ""
 "multicore processors."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1001,7 +1101,7 @@ msgstr ""
 "dual processor en SMP inschakelen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1010,7 +1110,7 @@ msgstr ""
 "inschakelen</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1030,20 +1130,34 @@ msgstr ""
 "interrupt: IRQ7\"). Schakel in dit geval APIC en/of lokale APIC uit."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Aanmeldingsnaam</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "In het <guibutton>Volgende</guibutton> scherm ziet u een lijst met alle "
 "beschikbare opties voor tijdens het opstarten. De standaard optie heeft een "
@@ -1054,13 +1168,13 @@ msgstr ""
 "toe te voegen of om een bestaande aan te passen. U dient bekend te zijn met "
 "Lilo of Grub om deze tools te kunnen gebruiken."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1070,8 +1184,8 @@ msgstr ""
 "wat u in het menu wil zien. Het komt overeen met het Grubcommando \"title\". "
 "Bijv.: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1079,8 +1193,8 @@ msgstr ""
 "Het <guilabel>Beeldbestand</guilabel>veld bevat de kernelnaam. Het komt "
 "overeen met het Grubcommando \"kernel\". Bijv. /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1088,8 +1202,9 @@ msgstr ""
 "Het <guilabel>Root</guilabel>veld bevat de apparaatnaam waar de kernel is "
 "opgeslagen. Het komt overeen met het Grubcommando \"root\". Bijv. (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1097,8 +1212,8 @@ msgstr ""
 "Het <guilabel>Toevoegen</guilabel>veld bevat de opties die bij het opstarten "
 "aan de kernel gegeven worden."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1106,102 +1221,76 @@ msgstr ""
 "Als het <guilabel>Standaard</guilabel>hokje is aangevinkt, zal Grub "
 "standaard deze ingang opstarten."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
 "file and a <guilabel>network profile</guilabel>, see <xref linkend="
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
-"In het extra <guilabel>Geavanceerd</guilabel>-scherm kunt u een <guilabel>"
-"Videomodus</guilabel>, een <guilabel>initrd</guilabel>-bestand en een "
-"<guilabel>netwerkprofiel</guilabel>, zie <xref linkend=\"draknetprofile\"/>, "
-"kiezen in de uitvouwlijsten."
-
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Automatische aanmelding instellen"
+"In het extra <guilabel>Geavanceerd</guilabel>-scherm kunt u een "
+"<guilabel>Videomodus</guilabel>, een <guilabel>initrd</guilabel>-bestand en "
+"een <guilabel>netwerkprofiel</guilabel>, zie <xref linkend=\"draknetprofile"
+"\"/>, kiezen in de uitvouwlijsten."
 
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Aanmeldingsnaam</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
-"\"bold\">drakboot</emphasis> te typen."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Deze tool<placeholder type=\"footnote\" id=\"0\"/> laat één gebruiker "
-"automatisch inloggen op zijn/haar werkomgeving, zonder een wachtwoord te "
-"hoeven geven. Dat heet autologin.  Dit kan een goed idee zijn als het "
-"systeem slechts door één persoon gebruikt wordt."
+"In het extra <guilabel>Geavanceerd</guilabel>-scherm kunt u een "
+"<guilabel>Videomodus</guilabel>, een <guilabel>initrd</guilabel>-bestand en "
+"een <guilabel>netwerkprofiel</guilabel>, zie <xref linkend=\"draknetprofile"
+"\"/>, kiezen in de uitvouwlijsten."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"U vindt hem in het <emphasis role=\"bold\">Opstarten</emphasis>-tabblad van "
-"het Mageia-configuratiecentrum, het heet \"Automatische aanmelding instellen"
-"\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "De knoppen van de interface spreken voor zich:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Vink <guibutton>Open het X-Windowsysteem bij opstarten</guibutton> aan, als "
-"u wilt dat het X-Windowsysteem bij het opstarten wordt uitgevoerd. Zo niet, "
-"dan start de computer in tekstmodus. Overigens kan de grafische omgeving dan "
-"handmatig gestart worden, met het commando 'startx' of 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Als het eerste hokje is aangevinkt, zijn er nog twee opties beschikbaar. "
-"Vink <guibutton>Nee, ik wil niet automatisch aanmelden</guibutton> aan, als "
-"u een inlogscherm wilt krijgen waarin om gebruiker en wachtwoord gevraagd "
-"wordt. Kies anders <guibutton>Ja, ik wil automatisch aanmelden met deze "
-"(gebruiker, werkomgeving)</guibutton>. In dat geval dient u ook de "
-"<guilabel>Standaard gebruiker</guilabel> en <guilabel>Standaard "
-"werkomgeving</guilabel> te kiezen."
+"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
+"\"bold\">drakboot</emphasis> te typen."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2555,22 +2644,22 @@ msgstr ""
 "root. We denken dat u niet meer informatie nodig heeft."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Schijfpartities beheren"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk of diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2581,7 +2670,7 @@ msgstr ""
 "te typen."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2596,7 +2685,7 @@ msgstr ""
 "<emphasis>Afsluiten</emphasis> als u niet zeker weet of u door wilt gaan."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2605,12 +2694,12 @@ msgstr ""
 "het gewenste tabblad te klikken (sda, sdb, sdc, etc)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2627,9 +2716,17 @@ msgstr ""
 "wissen, de andere knoppen worden rechts zichtbaar zodra u op een partitie "
 "klikt."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2639,12 +2736,12 @@ msgstr ""
 "Daartoe moet de partitie eerst ontkoppeld worden."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "U kunt een partitie alleen aan de rechterkant van grootte veranderen"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2657,21 +2754,22 @@ msgstr ""
 "verschijnt als een leeg deel van de schijf geselecteerd is."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "U kunt een koppelpunt maken dat niet bestaat, het zal aangemaakt worden."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Door op <emphasis><guibutton>Naar expert-modus</guibutton></emphasis> te "
@@ -2679,7 +2777,7 @@ msgstr ""
 "geven, zoals u kunt zien in de schermafbeelding hieronder."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -4136,10 +4234,10 @@ msgid ""
 "to be used to install and update packages and applications. (see Add button "
 "below)."
 msgstr ""
-"Na installatie dient u als eerste pakketbronnen (ook wel repositories, "
-"media of spiegelservers genoemd) toe te voegen. Dat betekent de bronnen "
-"kiezen die gebruikt worden om pakketten of toepassingen te installeren of "
-"bij te werken. (Zie Toevoegen-knop hieronder)."
+"Na installatie dient u als eerste pakketbronnen (ook wel repositories, media "
+"of spiegelservers genoemd) toe te voegen. Dat betekent de bronnen kiezen die "
+"gebruikt worden om pakketten of toepassingen te installeren of bij te "
+"werken. (Zie Toevoegen-knop hieronder)."
 
 #. type: Content of: <section><para><note><para>
 #: en/drakrpm-edit-media.xml:27
@@ -4513,10 +4611,10 @@ msgid ""
 msgstr ""
 "Om een hoog beveiligingsniveau te garanderen worden digitale sleutels "
 "gebruikt om de media te authenticeren. Voor elk van de media kunt u een "
-"sleutel toevoegen of verwijderen. Selecteer een medium en klik op <guibutton>"
-"Toevoegen</guibutton> om een nieuwe sleutel te gebruiken. Selecteer een "
-"sleutel die niet meer gebruikt mag worden en klik op <guibutton>Verwijderen</"
-"guibutton> om hem weg te halen."
+"sleutel toevoegen of verwijderen. Selecteer een medium en klik op "
+"<guibutton>Toevoegen</guibutton> om een nieuwe sleutel te gebruiken. "
+"Selecteer een sleutel die niet meer gebruikt mag worden en klik op "
+"<guibutton>Verwijderen</guibutton> om hem weg te halen."
 
 #. type: Content of: <section><section><para><warning><para>
 #: en/drakrpm-edit-media.xml:203
@@ -7038,13 +7136,14 @@ msgstr "Opstartstappen configureren"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -9697,11 +9796,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Deze tool<placeholder type=\"footnote\" id=\"0\"/> bevindt zich in het "
+"Mageia-configuratiecentrum, in het <emphasis role=\"bold\">Systeem</"
+"emphasis>-tabblad, en heet \"Gebruikers op het systeem beheren\""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -10425,6 +10528,9 @@ msgstr ""
 "bewaren, of de nieuwe accepteren. In het laatste geval moet u uit- en in-"
 "loggen om de nieuwe te activeren."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/pt_BR.po b/docs/mcc-help/pt_BR.po
index f742c561..7b0d7a39 100644
--- a/docs/mcc-help/pt_BR.po
+++ b/docs/mcc-help/pt_BR.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-07-05 02:37+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -854,7 +854,96 @@ msgstr ""
 "convida-o a fazê-lo e dar informação sobre isso."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Configurar login automático para fazer logon automaticamente no"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Você pode iniciar esta ferramenta de linha de comando, digitando <emphasis "
+"role=\"bold\">drakauth</emphasis> como root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Esta ferramenta <placeholder type=\"footnote\" id=\"0\"/> permite que você "
+"faça o login automaticamente com o mesmo usuário, em seu/seu ambiente de "
+"trabalho, sem pedir qualquer senha. É chamado login automático. Isso "
+"geralmente é uma boa idéia quando há apenas um usuário, como estar usando a "
+"máquina."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Pode ser encontrada sob a <emphasis role=\"bold\">Inicialização</emphasis> "
+"guia no Centro de Controle Mageia chamado \"Configurar login automático para "
+"fazer logon automaticamente em\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Os botões de interface são bastante óbvios:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Verifique <guibutton>Inicie o ambiente gráfico quando o sistema começa </"
+"guibutton>, se você quiser X Window System para ser executado após a "
+"inicialização. Se não, o sistema irá iniciar em modo texto. No entanto, será "
+"possível iniciar a interface gráfica manualmente. Isso pode ser feito com o "
+"lançamento do comando 'startx' ou 'systemctl começar dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Se a primeira caixa está marcada, outras duas opções estão disponíveis, "
+"verifique ou <guibutton>Não, eu não quero autologin</guibutton>, se você "
+"quiser que o sistema continue a pedir que o usuário se conectar (a senha) ou "
+"verificar <guibutton>Sim, eu quero autologin com este (usuário, desktop)</"
+"guibutton>, se necessário. Neste caso, você também precisa fornecer o nome "
+"de  <guilabel>usuário padrão</guilabel> e o <guilabel>desktop  padrão</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configure o sistema de inicialização"
 
@@ -864,23 +953,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Se você estiver usando um sistema UEFI, a interface do usuário é um pouco "
 "diferente pois você não pode escolher o carregador de inicialização do "
 "sistema (lista de sistemas instalados) uma vez que apenas um está disponível."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -894,9 +984,10 @@ msgstr ""
 "role=\"bold\">drakboot --boot</emphasis> como root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -905,16 +996,17 @@ msgstr ""
 "senha, o padrão de inicialização, etc)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Pode ser encontrada na aba Inicialização no Centro de Controle Mageia "
 "chamado \"Configurar sistema de inicialização\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -924,15 +1016,16 @@ msgstr ""
 "de novamente!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Na primeira parte, chamada <guilabel>Bootloader</guilabel>, é possível "
 "escolher qual <guibutton>Bootloader usar</guibutton>, Grub ou Lilo, e com "
@@ -943,12 +1036,21 @@ msgstr ""
 "instalado e qualquer modificação pode impedi-lo de máquina inicializar."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Na segunda parte, chamada <guilabel>principais opções</guilabel>, você pode "
@@ -959,7 +1061,7 @@ msgstr ""
 "uma vez que o atraso decorre."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -968,17 +1070,17 @@ msgstr ""
 "possível definir uma senha."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "O botão <guibutton>Avançado</guibutton> dá algumas opções extras."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Enable ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -991,12 +1093,12 @@ msgstr ""
 "esta caixa se o seu hardware é compatível com ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Enable SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1005,7 +1107,7 @@ msgstr ""
 "processadores multicore."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1014,7 +1116,7 @@ msgstr ""
 "processador dual e ativar o SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1023,7 +1125,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1044,20 +1146,34 @@ msgstr ""
 "Local."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID de Login</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Na <guibutton>Próxima</guibutton> tela, você pode ver a lista de todas as "
 "entradas disponíveis no momento da inicialização. O padrão é um asterisco. "
@@ -1068,13 +1184,13 @@ msgstr ""
 "modificar um já existente. Você precisa estar familiarizado com o LILO ou "
 "GRUB para ser capaz de usar essas ferramentas."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1084,8 +1200,8 @@ msgstr ""
 "você deseja ser exibido no menu. Ele corresponde ao Grub comando \"título "
 "\". Por exemplo: Mageia 3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1093,8 +1209,8 @@ msgstr ""
 "O campo <guilabel>Imagem</guilabel> contém o nome do kernel. Ele corresponde "
 "ao Grub comando \"do kernel\". Por exemplo /boot /vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1103,8 +1219,9 @@ msgstr ""
 "está armazenado. Ele corresponde ao Grub comando \"root\". Por exemplo, "
 "(hd0, 1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1112,8 +1229,8 @@ msgstr ""
 "O <guilabel>Anexo</guilabel> contém as opções a serem dadas para o kernel no "
 "momento da inicialização."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1121,8 +1238,8 @@ msgstr ""
 "Se a caixa <guilabel>Padrão</guilabel> estiver marcada, o Grub irá "
 "inicializar esta entrada por padrão."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1134,91 +1251,63 @@ msgstr ""
 "<guilabel>perfil da rede</guilabel >, veja <xref linkend=\"draknetprofile\"/"
 ">, nas listas drop-down."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Configurar login automático para fazer logon automaticamente no"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID de Login</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Você pode iniciar esta ferramenta de linha de comando, digitando <emphasis "
-"role=\"bold\">drakboot</emphasis> como root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Esta ferramenta <placeholder type=\"footnote\" id=\"0\"/> permite que você "
-"faça o login automaticamente com o mesmo usuário, em seu/seu ambiente de "
-"trabalho, sem pedir qualquer senha. É chamado login automático. Isso "
-"geralmente é uma boa idéia quando há apenas um usuário, como estar usando a "
-"máquina."
+"Na tela extra chamado de <guilabel>Avançado</guilabel>, é possível escolher "
+"o modo <guilabel>Vídeo</guilabel>, um arquivo<guilabel>initrd</guilabel> e "
+"<guilabel>perfil da rede</guilabel >, veja <xref linkend=\"draknetprofile\"/"
+">, nas listas drop-down."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Pode ser encontrada sob a <emphasis role=\"bold\">Inicialização</emphasis> "
-"guia no Centro de Controle Mageia chamado \"Configurar login automático para "
-"fazer logon automaticamente em\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Os botões de interface são bastante óbvios:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Verifique <guibutton>Inicie o ambiente gráfico quando o sistema começa </"
-"guibutton>, se você quiser X Window System para ser executado após a "
-"inicialização. Se não, o sistema irá iniciar em modo texto. No entanto, será "
-"possível iniciar a interface gráfica manualmente. Isso pode ser feito com o "
-"lançamento do comando 'startx' ou 'systemctl começar dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Se a primeira caixa está marcada, outras duas opções estão disponíveis, "
-"verifique ou <guibutton>Não, eu não quero autologin</guibutton>, se você "
-"quiser que o sistema continue a pedir que o usuário se conectar (a senha) ou "
-"verificar <guibutton>Sim, eu quero autologin com este (usuário, desktop)</"
-"guibutton>, se necessário. Neste caso, você também precisa fornecer o nome "
-"de  <guilabel>usuário padrão</guilabel> e o <guilabel>desktop  padrão</"
-"guilabel>."
+"Você pode iniciar esta ferramenta de linha de comando, digitando <emphasis "
+"role=\"bold\">drakboot</emphasis> como root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2639,22 +2728,22 @@ msgstr ""
 "mais informações sobre isso."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gerenciar partições de disco"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk ou diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2665,7 +2754,7 @@ msgstr ""
 "emphasis> como root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2681,7 +2770,7 @@ msgstr ""
 "continuar."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2691,12 +2780,12 @@ msgstr ""
 "sdc, etc.)"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2713,9 +2802,17 @@ msgstr ""
 "apagar o disco completo, os outros botões tornam-se visíveis à direita "
 "depois que você clica em uma partição."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2725,12 +2822,12 @@ msgstr ""
 "a partição deve ser desmontado primeiro."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Só é possível redimensionar uma partição no seu lado direito"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2743,20 +2840,21 @@ msgstr ""
 "vazio é selecionado"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Você pode escolher um ponto que não existe montagem, ele será criado."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Selecionando <emphasis><guibutton> Alternar para o modo expert </guibutton></"
@@ -2764,7 +2862,7 @@ msgstr ""
 "pode ser visto na imagem abaixo."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7647,13 +7745,14 @@ msgstr "Configure etapas de inicialização"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10587,10 +10686,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Esta ferramenta <placeholder type=\"footnote\" id=\"0\"/> é encontrado sob a "
 "<emphasis role=\"bold\">Sistema</emphasis> guia no Centro de Controle Mageia "
@@ -11388,3 +11488,6 @@ msgstr ""
 "para confirmar. Ainda há tempo para cancelar tudo e manter a configuração "
 "anterior, ou para aceitar. Neste caso, você tem que desconectar e reconectar "
 "para ativar a nova configuração."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/ro.po b/docs/mcc-help/ro.po
index 3d0ddadc..a970852a 100644
--- a/docs/mcc-help/ro.po
+++ b/docs/mcc-help/ro.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-29 14:21+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -850,7 +850,95 @@ msgstr ""
 "invită s-o faceți și vă oferă informațiile necesare în această privință."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Configurați autentificarea automată"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Puteți lansa această unealtă din linia de comandă, tastînd <emphasis role="
+"\"bold\">drakauth</emphasis> ca root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Această unealtă<placeholder type=\"footnote\" id=\"0\"/> vă permite să "
+"autentificați în mod automat același utilizator, în mediul său de birou, "
+"fără să se ceară vreo parolă. Se numește autentificare automată. Acest lucru "
+"poate fi în general o idee bună dacă mașina este folosită de un singur "
+"utilizator."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Se găsește în categoria <emphasis role=\"bold\">Demaraj</emphasis> din "
+"Centrul de Control Mageia intitulat „Configurați autentificarea automată”."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Butoanele interfeței sînt destul de evidente:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Bifați <guibutton>Lansează interfața grafică la demararea sistemului</"
+"guibutton> dacă doriți ca X Windows System să fie executat imediat după "
+"demarare. Altfel, sistemul va porni în mod text. În acest caz interfața "
+"grafică va putea fi lansată manual. Acest lucru se poate face tastînd în "
+"linie de comandă „startx”' sau „systemctl start dm”."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Dacă bifați prima căsuță, alte două opțiuni vor fi disponibile. Apoi alegeți "
+"<guibutton>Nu, nu vreau autentificare automată</guibutton> dacă doriți ca "
+"sistemul să ceară un utilizator (și parolă) pentru conectare, sau "
+"<guibutton>Da, vreau autentificare automată cu acest (utilizator, birou)</"
+"guibutton> dacă asta doriți. În acest caz va trebui să furnizați "
+"<guilabel>Utilizatorul implicit</guilabel> și <guilabel>Biroul implicit</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configurați demarajul sistemului"
 
@@ -860,23 +948,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Dacă utilizați un sistem UEFI, interfața utilizator este un pic diferită "
 "deoarece nu puteți alege încărcătorul de sistem (prima listă derulantă) din "
 "moment ce numai unul singur este disponibil."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -890,9 +979,10 @@ msgstr ""
 "\"bold\">drakboot --boot</emphasis> ca root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -901,16 +991,17 @@ msgstr ""
 "definirea unei parole, opțiunea de pornire implicită, etc.)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Se găsește în categoria demaraj din Centrul de Control Mageia intitulat "
 "„Configurați demarajul sistemului”."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -920,15 +1011,16 @@ msgstr ""
 "viitoare!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "În prima parte, numită <guilabel>Încărcător de sistem</guilabel>, puteți "
 "alege între GRUB sau LILO ca <guibutton>Încărcător de sistem utilizat</"
@@ -939,12 +1031,21 @@ msgstr ""
 "de demaraj și orice modificare poate împiedica demararea sistemului."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "În a doua parte, intitulată <guilabel>Opțiuni principale</guilabel>, puteți "
@@ -955,7 +1056,7 @@ msgstr ""
 "cînd s-a scurs timpul de așteptare."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -964,18 +1065,18 @@ msgstr ""
 "este posibil să definiți o parolă."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Butonul <guibutton>Avansat</guibutton> vă oferă cîteva opțiuni suplimentare."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Activează ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -988,12 +1089,12 @@ msgstr ""
 "căsuță dacă aveți componente compatibile ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Activează SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1002,7 +1103,7 @@ msgstr ""
 "procesoarele cu mai multe nuclee."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1011,7 +1112,7 @@ msgstr ""
 "procesor și va activa SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1020,7 +1121,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1041,20 +1142,34 @@ msgstr ""
 "acest caz dezactivați APIC și/sau APIC local."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Identificator de conexiune</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "În ecranul următor veți putea vedea lista tuturor intrărilor disponibile la "
 "demaraj. Cea implicită are un asterisc. Pentru a schimba ordinea intrărilor "
@@ -1064,13 +1179,13 @@ msgstr ""
 "modifica sau adăuga o nouă intrare în meniul GRUB. Trebuie să fiți "
 "familiarizat cu LILO sau GRUB pentru a putea utiliza aceste unelte."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1080,8 +1195,8 @@ msgstr ""
 "să fie afișat în meniu. Acesta corespunse comenzii GRUB „title”. De exemplu: "
 "Mageia 4."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1089,8 +1204,8 @@ msgstr ""
 "Cîmpul <guilabel>Imagine</guilabel> conține numele nucleului. Corespunde "
 "comenzii GRUB „kernel”. De exemplu: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1098,8 +1213,9 @@ msgstr ""
 "Cîmpul <guilabel>Root</guilabel> conține numele dispozitivului unde de află "
 "nucleul. Corespunde comenzi GRUB „root”. De exemplu: (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1107,8 +1223,8 @@ msgstr ""
 "Cîmpul <guilabel>Opțiuni aplicate nucleului</guilabel> conține opțiuni "
 "aplicate nucleului la demaraj."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1116,8 +1232,8 @@ msgstr ""
 "Dacă este bifată căsuța <guilabel>Implicit</guilabel>, GRUB va demara "
 "această intrare în mod implicit."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1129,90 +1245,63 @@ msgstr ""
 "un <guilabel>profil de rețea</guilabel>, vedeți <xref linkend="
 "\"draknetprofile\"/> în listele derulante."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Configurați autentificarea automată"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Identificator de conexiune</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Puteți lansa această unealtă din linia de comandă, tastînd <emphasis role="
-"\"bold\">drakboot</emphasis> ca root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Această unealtă<placeholder type=\"footnote\" id=\"0\"/> vă permite să "
-"autentificați în mod automat același utilizator, în mediul său de birou, "
-"fără să se ceară vreo parolă. Se numește autentificare automată. Acest lucru "
-"poate fi în general o idee bună dacă mașina este folosită de un singur "
-"utilizator."
+"În ecranul suplimentar intitulat <guilabel>Avansat</guilabel>, puteți alege "
+"<guilabel>Modul video</guilabel>, un fișier <guilabel>initrd</guilabel> și "
+"un <guilabel>profil de rețea</guilabel>, vedeți <xref linkend="
+"\"draknetprofile\"/> în listele derulante."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Se găsește în categoria <emphasis role=\"bold\">Demaraj</emphasis> din "
-"Centrul de Control Mageia intitulat „Configurați autentificarea automată”."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Butoanele interfeței sînt destul de evidente:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Bifați <guibutton>Lansează interfața grafică la demararea sistemului</"
-"guibutton> dacă doriți ca X Windows System să fie executat imediat după "
-"demarare. Altfel, sistemul va porni în mod text. În acest caz interfața "
-"grafică va putea fi lansată manual. Acest lucru se poate face tastînd în "
-"linie de comandă „startx”' sau „systemctl start dm”."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Dacă bifați prima căsuță, alte două opțiuni vor fi disponibile. Apoi alegeți "
-"<guibutton>Nu, nu vreau autentificare automată</guibutton> dacă doriți ca "
-"sistemul să ceară un utilizator (și parolă) pentru conectare, sau "
-"<guibutton>Da, vreau autentificare automată cu acest (utilizator, birou)</"
-"guibutton> dacă asta doriți. În acest caz va trebui să furnizați "
-"<guilabel>Utilizatorul implicit</guilabel> și <guilabel>Biroul implicit</"
-"guilabel>."
+"Puteți lansa această unealtă din linia de comandă, tastînd <emphasis role="
+"\"bold\">drakboot</emphasis> ca root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2631,22 +2720,22 @@ msgstr ""
 "trebuie mai multe informații despre asta."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gestionați partițiile"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk sau diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2657,7 +2746,7 @@ msgstr ""
 "emphasis> ca root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2673,7 +2762,7 @@ msgstr ""
 "să continuați."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2682,12 +2771,12 @@ msgstr ""
 "lucrați selectînd secțiunea corespunzătoare (sda, sdb, sdc etc)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2704,9 +2793,17 @@ msgstr ""
 "de mai jos este pentru ștergerea completă a discului, celelalte butoane "
 "devin vizibile pe partea dreaptă după ce faceți clic pe o partiție."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2716,12 +2813,12 @@ msgstr ""
 "operațiuni trebuie mai întîi s-o demontați."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "O partiție se poate redimensiona numai de partea sa dreaptă."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2734,20 +2831,21 @@ msgstr ""
 "discului."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Puteți alege un punct de montare care nu există, acesta va fi creat."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Selectînd <emphasis><guibutton>Comută în regim expert</guibutton></emphasis> "
@@ -2755,7 +2853,7 @@ msgstr ""
 "cum se poate vedea în captura de ecran de mai jos."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7658,13 +7756,14 @@ msgstr "Configurați demarajul sistemului"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10597,10 +10696,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Această unealtă<placeholder type=\"footnote\" id=\"0\"/> se găsește în "
 "categoria <emphasis role=\"bold\">Sistem</emphasis> din Centrul de Control "
@@ -11406,3 +11506,6 @@ msgstr ""
 "cere să confirmați. Încă se mai poate anula totul și păstra configurația "
 "precedentă, sau să acceptați. În acest caz, va trebui să vă deconectați și "
 "reconectați pentru a activa noua configurație."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/ru.po b/docs/mcc-help/ru.po
index 08a4f9b1..0675019e 100644
--- a/docs/mcc-help/ru.po
+++ b/docs/mcc-help/ru.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-23 08:40+0000\n"
 "Last-Translator: Valentin XliN Saikov <saikov.vb@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
@@ -881,7 +881,98 @@ msgstr ""
 "быть предоставлены администратором сети."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Настройка автовхода"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakauth</emphasis> от имени администратора (root)."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно "
+"приказать системе загружаться в аккаунт того же пользователя и в той же "
+"рабочей среде без необходимости ввода пароля. Такая возможность называется "
+"автовход. Как правило, такой способ загрузки является удобным, если "
+"компьютером будет пользоваться только один пользователь."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Доступ к этой программе можно получить с помощью пункта <emphasis role=\"bold"
+"\">«Загрузка»</emphasis> из Центра управления Mageia. Раздел «Настройка "
+"автовхода»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Назначение кнопок интерфейса является достаточно очевидным:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Отметьте пункт <guibutton>Запускать графическую оболочку при загрузке</"
+"guibutton>, если вы хотите запускать систему X Window во время загрузки. "
+"Если параметр отмечен не будет, система запустится в текстовом режиме. "
+"Впрочем, графический интерфейс можно будет запустить из текстового режима "
+"вручную. Сделать это можно с помощью команды 'startx' или 'systemctl start "
+"dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Если установлен первый пункт, вы получите доступ к двум другим пунктам. Вы "
+"можете выбрать пункт <guibutton>Нет, я не хочу использовать автоматический "
+"вход</guibutton>, если вы хотите, чтобы система продолжала спрашивать вас о "
+"том, под какой из учётных записей пользователей следует войти и будет "
+"просить ввести пароль. Другим вариантом является обозначение пункта "
+"<guibutton>Да, я хочу осуществлять автовход под этим (пользователем, рабочим "
+"столом)</guibutton>, в этом случае вам следует указать значения параметров "
+"<guilabel>Пользователь</guilabel> и <guilabel>Рабочий стол</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Настройка способа загрузки системы"
 
@@ -891,23 +982,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Если вы пользуетесь системой с UEFI system, интерфейс немного отличаться, "
 "поскольку вы не сможете выбрать загрузчик (с первого раскрывающегося "
 "списка), - здесь выбор будет однозначным."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -922,9 +1014,10 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -933,16 +1026,17 @@ msgstr ""
 "пароль, определить вариант загрузки по умолчанию и др.)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Доступ к этой программе можно получить с помощью пункта «Загрузка» из Центра "
 "управления Mageia. Раздел «Настройка загрузки»."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -952,15 +1046,16 @@ msgstr ""
 "помешать штатной загрузке вашей системы!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "С помощью первой части с названием <guilabel>Загрузчик</guilabel> можно "
 "выбрать загрузчик, который следует использовать Grub или Lilo, и определить "
@@ -972,12 +1067,21 @@ msgstr ""
 "загрузчик, любые изменения могут помешать загрузке системы."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "С помощью второй части, <guilabel>Основные параметры</guilabel>, вы можете "
@@ -988,7 +1092,7 @@ msgstr ""
 "умолчанию."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -997,19 +1101,19 @@ msgstr ""
 "<guibutton>Безопасность</guibutton>, можно установить пароль для загрузчика."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "С помощью кнопки <guibutton>Дополнительно</guibutton> можно получить доступ "
 "к дополнительным параметрам."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Включить ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1023,12 +1127,12 @@ msgstr ""
 "этот пункт, если ваше оборудование является совместимым с ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Включить SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1037,7 +1141,7 @@ msgstr ""
 "многопроцессорный), так называется архитектура многопроцессорных систем."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1046,7 +1150,7 @@ msgstr ""
 "HyperThreading, Mageia определит его как двойной процессор и включит SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1055,7 +1159,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1078,20 +1182,34 @@ msgstr ""
 "или локальный APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Логин пользователя</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "После нажатия кнопки <guibutton>Далее</guibutton> вы увидите список всех "
 "доступных пунктов меню загрузки. Пункт по умолчанию помечен звёздочкой. "
@@ -1103,13 +1221,13 @@ msgstr ""
 "используйте эти кнопки, если вы не знакомы с синтаксисом команд Lilo или "
 "Grub."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1119,8 +1237,8 @@ msgstr ""
 "можете вписать что угодно, что хотите видеть в меню. Этот пункт "
 "соответствует команде Grub «title». Пример: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1128,8 +1246,8 @@ msgstr ""
 "В поле <guilabel>Образ</guilabel> должно быть указано название ядра. Этот "
 "пункт соответствует команде Grub «kernel». Пример: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1138,8 +1256,9 @@ msgstr ""
 "на котором хранится ядро. Этот пункт соответствует команде Grub «root». "
 "Пример: (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1147,8 +1266,8 @@ msgstr ""
 "В поле <guilabel>Добавить</guilabel> должны быть указаны параметры, которые "
 "передаются ядру во время загрузки."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1156,8 +1275,8 @@ msgstr ""
 "Если будет выбрана опция <guilabel>По умолчанию</guilabel>, Grub загружает "
 "соответствующую систему по умолчанию."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1169,93 +1288,63 @@ msgstr ""
 "<guilabel>initrd</guilabel> и <guilabel>Сетевой профиль</guilabel> см. <xref "
 "linkend=\"draknetprofile\"/>, из выпадающего списка."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Настройка автовхода"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Логин пользователя</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
-"<emphasis role=\"bold\">drakboot</emphasis> от имени администратора (root)."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно "
-"приказать системе загружаться в аккаунт того же пользователя и в той же "
-"рабочей среде без необходимости ввода пароля. Такая возможность называется "
-"автовход. Как правило, такой способ загрузки является удобным, если "
-"компьютером будет пользоваться только один пользователь."
+"С помощью дополнительного окна, открыть которое можно нажатием кнопки "
+"<guilabel>Дополнительно</guilabel>, <guilabel>Режим видео</guilabel>, "
+"<guilabel>initrd</guilabel> и <guilabel>Сетевой профиль</guilabel> см. <xref "
+"linkend=\"draknetprofile\"/>, из выпадающего списка."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Доступ к этой программе можно получить с помощью пункта <emphasis role=\"bold"
-"\">«Загрузка»</emphasis> из Центра управления Mageia. Раздел «Настройка "
-"автовхода»."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Назначение кнопок интерфейса является достаточно очевидным:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Отметьте пункт <guibutton>Запускать графическую оболочку при загрузке</"
-"guibutton>, если вы хотите запускать систему X Window во время загрузки. "
-"Если параметр отмечен не будет, система запустится в текстовом режиме. "
-"Впрочем, графический интерфейс можно будет запустить из текстового режима "
-"вручную. Сделать это можно с помощью команды 'startx' или 'systemctl start "
-"dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Если установлен первый пункт, вы получите доступ к двум другим пунктам. Вы "
-"можете выбрать пункт <guibutton>Нет, я не хочу использовать автоматический "
-"вход</guibutton>, если вы хотите, чтобы система продолжала спрашивать вас о "
-"том, под какой из учётных записей пользователей следует войти и будет "
-"просить ввести пароль. Другим вариантом является обозначение пункта "
-"<guibutton>Да, я хочу осуществлять автовход под этим (пользователем, рабочим "
-"столом)</guibutton>, в этом случае вам следует указать значения параметров "
-"<guilabel>Пользователь</guilabel> и <guilabel>Рабочий стол</guilabel>."
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakboot</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2711,22 +2800,22 @@ msgstr ""
 "идет речь."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Управление разделами диска"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk або diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2737,7 +2826,7 @@ msgstr ""
 "\">diskdrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2753,7 +2842,7 @@ msgstr ""
 "с программой."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2763,12 +2852,12 @@ msgstr ""
 "д.)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2786,9 +2875,17 @@ msgstr ""
 "предназначена для стирания всего диска. Доступ к другим кнопкам действий, "
 "расположенных справа, можно получить после нажатия на картинке раздела диска."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2799,14 +2896,14 @@ msgstr ""
 "вам следует сначала размонтировать раздел."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Изменение размеров раздела можно выполнять только за счет правой границы "
 "раздела."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2819,22 +2916,23 @@ msgstr ""
 "\">Создать</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Вы можете выбрать точку монтирования, которой не существует. Если будет "
 "осуществлен такой выбор, соответствующая точка монтирования будет создана."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Нажатие кнопки <emphasis><guibutton>Переключить в режим эксперта</"
@@ -2843,7 +2941,7 @@ msgstr ""
 "снимке."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7846,13 +7944,14 @@ msgstr "Настройка последовательности загрузки
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10850,10 +10949,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно "
 "получить с помощью пункта <emphasis role=\"bold\">Система</emphasis> из "
@@ -11690,3 +11790,6 @@ msgstr ""
 "предыдущие настройки или подтвердить их внесения. Если изменения будут "
 "подтверждены, вам придется выйти из учетной записи и снова войти в него, "
 "чтобы задействовать внесены изменения."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/sv.po b/docs/mcc-help/sv.po
index 00935d50..3732a45c 100644
--- a/docs/mcc-help/sv.po
+++ b/docs/mcc-help/sv.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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-23 10:30+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
@@ -833,7 +833,94 @@ msgstr ""
 "göra det och ger dig information om det."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Konfigurera autologin för automatisk inloggning"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Du kan starta det här verktyget från kommandoraden genom att skriva "
+"<emphasis role=\"bold\">drakauth</emphasis> som root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Med detta verktyg<placeholder type=\"footnote\" id=\"0\"/> kan du ställa in "
+"automatisk inloggning för en användare utan att ange lösenord. Det kallas "
+"automatisk inloggning och kan vara användbart när det bara finns en "
+"användare som använder datorn."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Det finns under <emphasis role=\"bold\">Start</emphasis>-fliken i Mageias "
+"kontrollcenter och är märkt \"Ställ in automatisk inloggning\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Gränssnittets knappar är ganska uppenbara:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Kryssa i <guibutton>Starta det grafiska gränssnittet automatiskt när datorn "
+"startar</guibutton> om du vill att X-fönstersystem ska startas efter "
+"uppstarten. Annars kommer systemet att starta i textbaserad läge. Oavsett "
+"vad så är det möjligt att starta det grafiska gränssnittet manuellt, genom "
+"att t. ex. att köra kommandot 'startx' eller 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Om första rutan är ikryssad kommer två nya alternativ att vara tillgängliga, "
+"antingen väljer du <guibutton>Nej, jag vill inte använda autologin</"
+"guibutton> om du vill att systemet ska fortsätta att fråga om användarnamn "
+"och lösenord, eller kryssa i <guibutton>Ja, jag vill använda autologin för "
+"denna (användare, skrivbord)</guibutton> om nödvändigt. I så fall måste du "
+"även ange <guilabel>standardanvändare</guilabel> och <guilabel>standard "
+"skrivbordsmiljö</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Ställ in uppstartssystemet"
 
@@ -843,23 +930,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Om du använder ett UEFI-system så är gränssnittet något annorlunda eftersom "
 "du inte kan välja starthanterare (första rullgardinsmenyn), det finns bara "
 "en tillgänglig."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -873,9 +961,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis> som root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -884,16 +973,17 @@ msgstr ""
 "lösenord, standard-uppstarten etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Det hittas under fliken Uppstart i Mageia's Kontrollcentral märkt \"Ställ in "
 "uppstartssystemet\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -902,15 +992,16 @@ msgstr ""
 "ändra några inställningar kan förhindra att din maskin startar upp igen !"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "I den första delen kallad <guilabel>Starthanterare</guilabel> kan man välja "
 "vilken starthanterare som ska användas, antingen Grub eller Lilo och med "
@@ -921,12 +1012,21 @@ msgstr ""
 "att starta."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "I andra delen kallad <guilabel>Huvudinställningar</guilabel> kan du ställa "
@@ -937,7 +1037,7 @@ msgstr ""
 "ut."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -946,17 +1046,17 @@ msgstr ""
 "det möjligt att ställa in ett lösenord."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "Knappen <guibutton>Avancerat</guibutton> ger några extra val."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Aktivera ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -969,12 +1069,12 @@ msgstr ""
 "är ACPI-kompatibel."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Aktivera SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -983,7 +1083,7 @@ msgstr ""
 "processorer med flera kärnor."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -992,7 +1092,7 @@ msgstr ""
 "dubbelkärnig processor och aktivera SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1001,7 +1101,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1022,20 +1122,34 @@ msgstr ""
 "eller lokal APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Inloggnings-ID</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "På <guibutton>Nästa</guibutton> skärm visas alla tillgängliga poster som "
 "finns vid uppstart. Standard är markerad med en asterisk. Klicka på upp "
@@ -1045,13 +1159,13 @@ msgstr ""
 "nya poster i Grubmenyn eller ändra befintliga. Du bör känna till hur Lilo "
 "eller Grub fungerar för att använda dessa verktyg."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1060,8 +1174,8 @@ msgstr ""
 "<guilabel>Etikettfältet</guilabel> är valfritt, ange vad som ska visas i "
 "menyn. Det matchar Grubs titel-kommando. T. ex: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1069,8 +1183,8 @@ msgstr ""
 "Fältet <guilabel>Avbild</guilabel> innehåller namnet på kärnan. Det matchar "
 "Grub-kommandot \"kernel\". Till exempel /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1078,8 +1192,9 @@ msgstr ""
 "Fältet <guilabel>Root</guilabel> innehåller enhetsnamnet där kärnan lagras. "
 "Det matchar Grub-kommandot \"root\". Till exempel (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1087,8 +1202,8 @@ msgstr ""
 "Fältet <guilabel>Bifoga</guilabel> innehåller valen som ska anges till "
 "kärnan vid tid för uppstart."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1096,8 +1211,8 @@ msgstr ""
 "Om rutan <guilabel>Standard</guilabel> är förvalt så kommer Grub att ladda "
 "den här posten som standard."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1109,87 +1224,61 @@ msgstr ""
 "<guilabel>nätverksprofil</guilabel>. Titta i <xref linkend=\"draknetprofile"
 "\"/> i rullgardinsmenyerna."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Konfigurera autologin för automatisk inloggning"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Inloggnings-ID</emphasis>"
 
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
+msgid ""
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
+msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
 msgstr "drakboot.png"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
-msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
-msgstr "Du kan starta det här verktyget från "
-
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Med detta verktyg<placeholder type=\"footnote\" id=\"0\"/> kan du ställa in "
-"automatisk inloggning för en användare utan att ange lösenord. Det kallas "
-"automatisk inloggning och kan vara användbart när det bara finns en "
-"användare som använder datorn."
+"I rutan för <guilabel>Avancerat</guilabel> är det möjligt att välja "
+"<guilabel>videoläge</guilabel>, en <guilabel>initrd</guilabel>-fil och en "
+"<guilabel>nätverksprofil</guilabel>. Titta i <xref linkend=\"draknetprofile"
+"\"/> i rullgardinsmenyerna."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Det finns under <emphasis role=\"bold\">Start</emphasis>-fliken i Mageias "
-"kontrollcenter och är märkt \"Ställ in automatisk inloggning\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Gränssnittets knappar är ganska uppenbara:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Kryssa i <guibutton>Starta det grafiska gränssnittet automatiskt när datorn "
-"startar</guibutton> om du vill att X-fönstersystem ska startas efter "
-"uppstarten. Annars kommer systemet att starta i textbaserad läge. Oavsett "
-"vad så är det möjligt att starta det grafiska gränssnittet manuellt, genom "
-"att t. ex. att köra kommandot 'startx' eller 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
-msgstr ""
-"Om första rutan är ikryssad kommer två nya alternativ att vara tillgängliga, "
-"antingen väljer du <guibutton>Nej, jag vill inte använda autologin</"
-"guibutton> om du vill att systemet ska fortsätta att fråga om användarnamn "
-"och lösenord, eller kryssa i <guibutton>Ja, jag vill använda autologin för "
-"denna (användare, skrivbord)</guibutton> om nödvändigt. I så fall måste du "
-"även ange <guilabel>standardanvändare</guilabel> och <guilabel>standard "
-"skrivbordsmiljö</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
+msgstr "Du kan starta det här verktyget från "
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2591,22 +2680,22 @@ msgstr ""
 "inte du behöver mer information än så."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Hantera hårddisk-partitioner"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk eller diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2617,7 +2706,7 @@ msgstr ""
 "emphasis> som root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2632,7 +2721,7 @@ msgstr ""
 "emphasis> om du är osäker på om du vill fortsätta."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2641,12 +2730,12 @@ msgstr ""
 "jobba på genom att välja den korrekta fliken (sda, sdb, sdc osv)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2662,9 +2751,17 @@ msgstr ""
 "längst ner används för att radera hela disken, de andra knapparna blir "
 "synliga och visas till höger när du klickat på en partition."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2674,12 +2771,12 @@ msgstr ""
 "det så måste partitionen avmonteras först."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Det är endast möjligt att skala partitionen på dess högra sida."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2692,22 +2789,23 @@ msgstr ""
 "oanvänt diskutrymme."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Du kan välja en monteringspunkt som inte existerar, den kommer då att bli "
 "skapad."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Att välja <emphasis><guibutton>Byt till expertläge</guibutton></emphasis> "
@@ -2715,7 +2813,7 @@ msgstr ""
 "i skärmdumpen nedan."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7537,13 +7635,14 @@ msgstr "Konfigurera start-steg"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10427,10 +10526,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Det här verktyget<placeholder type=\"footnote\" id=\"0\"/> finns under "
 "fliken <emphasis role=\"bold\">System</emphasis> i Mageias kontrollcentral "
@@ -11224,3 +11324,6 @@ msgstr ""
 "bekräfta ändringarna. Du kan fortfaranade avbryta och behålla de tidigare "
 "inställningarna, eller acceptera. I det här fallet måste du koppla ner och "
 "sedan koppla upp igen för att den nya konfigurationen ska gälla."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/tr.po b/docs/mcc-help/tr.po
index c17c8d74..54438193 100644
--- a/docs/mcc-help/tr.po
+++ b/docs/mcc-help/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-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-25 01:22+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -839,7 +839,94 @@ msgstr ""
 "değiştirin ve hakkında ona bilgi verin."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Otomatik oturum açmayı ayarlayın"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakauth</"
+"emphasis> yazarak çalıştırabilirsiniz."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Bu aygıt<placeholder type=\"footnote\" id=\"0\"/>parola sormadan aynı "
+"kullanıcının kendi masaüstü ortamına kendiliğinden giriş yapmasını sağlar. "
+"Otomatik giriş olarak adlandırılır.   Makineyi kullanacak tek bir kullanıcı "
+"varsa bu genellikle iyi bir fikirdir."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Mageia Denetim Merkezinde <emphasis role=\"bold\">Önyükleme</emphasis> "
+"sekmesi altında \"Otomatik oturum açmayı ayarlayın\" etiketi altında bulunur."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Arayüz düğmeleri oldukça açıktır:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Eğer X Window System önyükleme sonrası çalıştırılacaksa <guibutton>Grafiksel "
+"ortam açılışta çalıştırılsın</guibutton> kutusunu işaretleyin. Aksi durumda "
+"sistem metin kipinde başlatılacaktır. Yine de grafik arayüzü elle başlatmak "
+"mümkün olacaktır. Bu ise 'startx' veya 'systemctl start dm' komutunu "
+"çalıştırarak yapılabilir."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Eğer ilk kutu işaretlenmiş ise, diğer iki seçeneğe erişilebilir, eğer "
+"sistemin hangi kullanıcının oturum açacağını (ve parola) sormaya devam "
+"etmesini istiyorsanız <guibutton>Hayır, otomatik oturum açma istemiyorum</"
+"guibutton> ya da  gerekliyse <guibutton>Evet, şununla (kullanıcı, masaüstü) "
+"otomatik oturum açmak istiyorum</guibutton> işaretleyin. Bu durumda ayrıca  "
+"<guilabel>Varsayılan kullanıcı adı</guilabel>nı ve <guilabel>Varsayılan "
+"masaüstü</guilabel>nü girmeniz gerekir. "
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Önyükleme sistemini ayarlayın"
 
@@ -849,22 +936,23 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Bir UEFI sistem kullanıyorsanız kullanıcı arayüzü biraz farklıdır çünkü "
 "sadece bir tane mevcut olduğundan önyükleyici (ilk açılır menü) seçemezsiniz."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -878,9 +966,10 @@ msgstr ""
 "emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -889,16 +978,17 @@ msgstr ""
 "ayarlamanızı sağlar"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Mageia Denetim Merkezi' ndeki Önyükleme sekmesinde \"Önyükleme sistemini "
 "ayarlayın\" etiketi altında bulunur."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -907,15 +997,16 @@ msgstr ""
 "ayarlarını değiştirerek makinenizin tekrar başlamasına engel olabilir!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "<guilabel>Önyükleyici</guilabel> denilen ilk bölümde, hangi "
 "<guibutton>Önyükleyicinin kullanılacağı</guibutton>nı, Grub veya Lilo ve "
@@ -927,12 +1018,21 @@ msgstr ""
 "yapmasını engelleyebileceğini unutmayın."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "<guilabel>Ana seçenekler</guilabel> olarak adlandırılan ikinci bölümde, "
@@ -943,7 +1043,7 @@ msgstr ""
 "tanımlı olanı yükleyecektir."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -952,17 +1052,17 @@ msgstr ""
 "ayarlamak mümkündür."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "<guibutton>Gelişmiş</guibutton> düğmesi ise bazı ek seçenekler sunar."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI özelliğini etkinleştir:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -975,12 +1075,12 @@ msgstr ""
 "seçeneği işaretleyin."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP özelliğini etkinleştir:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -989,7 +1089,7 @@ msgstr ""
 "işlemciler için bir mimaridir."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -998,7 +1098,7 @@ msgstr ""
 "olarak algılayacak ve SMP etkinleştirilecektir."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1008,7 +1108,7 @@ msgstr ""
 "Boot sekmesi altında bulunur."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1029,20 +1129,34 @@ msgstr ""
 "bırakılmalıdır."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Oturum ID</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "<guibutton>İleri</guibutton> ekranında, önyükleme sırasında kullanılabilir "
 "durumdaki tüm girdilerin bir listesini görebilirsiniz. Öntanımlı olan yıldız "
@@ -1053,13 +1167,13 @@ msgstr ""
 "pencere açılacaktır. Bu araçları kullanabilmek için Lilo veya Grub' a aşina "
 "olmanız gerekir. "
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1069,8 +1183,8 @@ msgstr ""
 "görüntülenmesini istediğiniz şekilde yazın. Grub komutlarından \"title\" ile "
 "aynıdır. Örneğin: Mageia3"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1078,8 +1192,8 @@ msgstr ""
 "<guilabel>Görüntü</guilabel> alanı çekirdek adını içerir. Grub komutu "
 "\"kernel\" ile eşleşmektedir. Örneğin /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1087,8 +1201,9 @@ msgstr ""
 "<guilabel>Kök</guilabel> alanı çekirdeğin depolandığı aygıt adını içerir. "
 "Grub komutu \"root\" ile eşleşmektedir. Örneğin (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1096,8 +1211,8 @@ msgstr ""
 "<guilabel>Sonuna ekle</guilabel> alanı çekirdeğe önyükleme anında verilen "
 "seçenekleri içerir."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1105,8 +1220,8 @@ msgstr ""
 "<guilabel>Öntanımlı</guilabel> kutucuğu işaretliyse, Grub öntanımlı olarak "
 "bu girdi ile önyükleme yapacaktır."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1118,89 +1233,63 @@ msgstr ""
 "ve bir <guilabel>ağ profili</guilabel>ni seçmek mümkündür. Açılır menü "
 "listesinden <xref linkend=\"draknetprofile\"/>e bakın."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Otomatik oturum açmayı ayarlayın"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Oturum ID</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot</"
-"emphasis> yazarak çalıştırabilirsiniz."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Bu aygıt<placeholder type=\"footnote\" id=\"0\"/>parola sormadan aynı "
-"kullanıcının kendi masaüstü ortamına kendiliğinden giriş yapmasını sağlar. "
-"Otomatik giriş olarak adlandırılır.   Makineyi kullanacak tek bir kullanıcı "
-"varsa bu genellikle iyi bir fikirdir."
+"<guilabel>Gelişmiş</guilabel> ekranında; açılır menüler yardımıyla "
+"<guilabel>Ekran kipi</guilabel>ni, bir <guilabel>initrd</guilabel> dosyasını "
+"ve bir <guilabel>ağ profili</guilabel>ni seçmek mümkündür. Açılır menü "
+"listesinden <xref linkend=\"draknetprofile\"/>e bakın."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Mageia Denetim Merkezinde <emphasis role=\"bold\">Önyükleme</emphasis> "
-"sekmesi altında \"Otomatik oturum açmayı ayarlayın\" etiketi altında bulunur."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Arayüz düğmeleri oldukça açıktır:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Eğer X Window System önyükleme sonrası çalıştırılacaksa <guibutton>Grafiksel "
-"ortam açılışta çalıştırılsın</guibutton> kutusunu işaretleyin. Aksi durumda "
-"sistem metin kipinde başlatılacaktır. Yine de grafik arayüzü elle başlatmak "
-"mümkün olacaktır. Bu ise 'startx' veya 'systemctl start dm' komutunu "
-"çalıştırarak yapılabilir."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Eğer ilk kutu işaretlenmiş ise, diğer iki seçeneğe erişilebilir, eğer "
-"sistemin hangi kullanıcının oturum açacağını (ve parola) sormaya devam "
-"etmesini istiyorsanız <guibutton>Hayır, otomatik oturum açma istemiyorum</"
-"guibutton> ya da  gerekliyse <guibutton>Evet, şununla (kullanıcı, masaüstü) "
-"otomatik oturum açmak istiyorum</guibutton> işaretleyin. Bu durumda ayrıca  "
-"<guilabel>Varsayılan kullanıcı adı</guilabel>nı ve <guilabel>Varsayılan "
-"masaüstü</guilabel>nü girmeniz gerekir. "
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2600,22 +2689,22 @@ msgstr ""
 "olmadığını düşünüyoruz. "
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Disk bölümlerini yönet"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk veya diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2626,7 +2715,7 @@ msgstr ""
 "başlatabilirsiniz."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2641,7 +2730,7 @@ msgstr ""
 "etmek istediğinize emin değilseniz <emphasis>Çıkış</emphasis>a tıklayınız."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2650,12 +2739,12 @@ msgstr ""
 "vb.) üzerinde çalışmak istediğiniz sabit diske geçebilirsiniz."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2672,9 +2761,17 @@ msgstr ""
 "silmek içindir, sağ taraftaki diğer düğmeler bir bölüme tıkladığınızda "
 "görünür olur."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2684,12 +2781,12 @@ msgstr ""
 "bölümün ayırılması gerekir."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Bir bölümün sadece sağ tarafını yeniden boyutlandırmak mümkündür."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2701,20 +2798,21 @@ msgstr ""
 "\">Oluştur</guibutton> düğmesi görünecektir."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Varolmayan bir bağlama noktaı seçebilirsiniz, oluşturulacaktır."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "<emphasis><guibutton>Uzman moduna geç</guibutton></emphasis> seçilerek, "
@@ -2722,7 +2820,7 @@ msgstr ""
 "işlemler gelir."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7552,13 +7650,14 @@ msgstr "Önyükleme aşamalarını yapılandırın"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10452,10 +10551,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
 "<emphasis role=\"bold\">Sistem</emphasis> sekmesinde <guilabel>Windows(TM) "
@@ -11248,6 +11348,9 @@ msgstr ""
 "koruma veya kabul etme fırsatı vardır. Bu durumda, yeni yapılandırmanın "
 "etkili olabilmesi için bağlantıyı kapatıp yeniden bağlanmalısınız."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/uk.po b/docs/mcc-help/uk.po
index cdfd6f97..cc0fa767 100644
--- a/docs/mcc-help/uk.po
+++ b/docs/mcc-help/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-23 09:34+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -876,7 +876,98 @@ msgstr ""
 "адміністратором мережі."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Налаштовування автореєстрації"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
+"<emphasis role=\"bold\">drakauth</emphasis> від імені адміністратора (root)."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"За допомогою цієї програми<placeholder type=\"footnote\" id=\"0\"/> можна "
+"наказати системі завантажуватися до облікового запису того самого "
+"користувача та до того самого стільничного середовища без потреби у введенні "
+"пароля. Така можливість називається автореєстрацією. Зазвичай, такий спосіб "
+"завантаження є зручним, якщо комп’ютером буде користуватися лише один "
+"користувач."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Доступ до цієї програми можна отримати за допомогою сторінки <emphasis role="
+"\"bold\">«Завантаження»</emphasis> Центру керування Mageia. Пункт підписано "
+"«Налаштувати автореєстрацію»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Призначення кнопок інтерфейсу є доволі очевидним:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Позначте пункт <guibutton>Запускати графічну оболонку при завантаженні</"
+"guibutton>, якщо ви хочете запускати систему X Window під час завантаження. "
+"Якщо пункт позначено не буде, система запускатиметься у текстовому режимі. "
+"Втім, графічний інтерфейс можна буде запустити з текстового. Зробити це "
+"можна за допомогою команди «startx» або «systemctl start dm»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Якщо буде позначено перший пункт, ви отримаєте доступу до двох інших "
+"пунктів. Ви можете вибрати пункт <guibutton>Ні, мені не потрібна автоматична "
+"реєстрація</guibutton>, якщо ви хочете, щоб система продовжувала запитувати "
+"вас про те, до якого з облікових записів користувачів слід увійти, і просити "
+"ввести пароль. Іншим варіантом є позначення пункту <guibutton>Так, я хочу "
+"реєструватися в системі з цим (іменем, стільницею)</guibutton>, у цьому "
+"випадку вам слід вказати значення для пунктів <guilabel>Типовий користувач</"
+"guilabel> і <guilabel>Типова стільниця</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Налаштовування способу завантаження системи"
 
@@ -886,23 +977,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using 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."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Якщо ви користуєтеся системою з UEFI system, інтерфейс користувача трохи "
 "відрізнятиметься, оскільки ви не зможете вибрати завантажувач (з першого "
 "спадного списку), — тут вибір буде однозначним."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -917,9 +1009,10 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -928,17 +1021,18 @@ msgstr ""
 "встановити пароль, визначити типовий варіант завантаження тощо)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Доступ до цієї програми можна отримати за допомогою сторінки «Завантаження» "
 "Центру керування Mageia. Пункт підписано «Налаштувати спосіб завантаження "
 "системи»."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -948,15 +1042,16 @@ msgstr ""
 "завантаженню вашої системи!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "За допомогою першої групи з назвою <guilabel>Завантажувач</guilabel> можна "
 "вибрати завантажувач, який слід використовувати, Grub or Lilo, та визначити "
@@ -968,12 +1063,21 @@ msgstr ""
 "зміни можуть завадити завантаженню системи."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "За допомогою другої групи, <guilabel>Основні параметри</guilabel>, ви можете "
@@ -983,7 +1087,7 @@ msgstr ""
 "буде здійснено, завантажувачем буде завантажено типову систему."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -992,19 +1096,19 @@ msgstr ""
 "<guibutton>Безпека</guibutton>, можна встановити пароль до завантажувача."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "За допомогою кнопки <guibutton>Додатково</guibutton> можна отримати доступ "
 "до додаткових параметрів."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Увімкнути ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1018,12 +1122,12 @@ msgstr ""
 "якщо ваше обладнання є сумісним з ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Увімкнути SMP</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1032,7 +1136,7 @@ msgstr ""
 "багатпроцесорність), так називається архітектура багатопроцесорних систем."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1041,7 +1145,7 @@ msgstr ""
 "HyperThreading, Mageia визначить його як подвійний процесор і увімкне SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1050,7 +1154,7 @@ msgstr ""
 "</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1073,20 +1177,34 @@ msgstr ""
 "локальний APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Ідентифікатор користувача</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Після натискання кнопки <guibutton>Далі</guibutton> ви побачите список усіх "
 "доступних пунктів меню завантаження. Типовий пункт позначено зірочкою. Щоб "
@@ -1097,13 +1215,13 @@ msgstr ""
 "Grub або змінити вже наявний пункт меню. Не використовуйте ці кнопки, якщо "
 "ви не знайомі з синтаксисом команд Lilo або Grub."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1113,8 +1231,8 @@ msgstr ""
 "вписати будь-що, що хочете бачити у меню. Цей пункт відповідає команді Grub "
 "«title». Приклад: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1122,8 +1240,8 @@ msgstr ""
 "У полі <guilabel>Образ</guilabel> має бути вказано назву ядра. Цей пункт "
 "відповідає команді Grub «kernel». Приклад: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1132,8 +1250,9 @@ msgstr ""
 "зберігається ядро. Цей пункт відповідає команді Grub «root». Приклад: "
 "(hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1141,8 +1260,8 @@ msgstr ""
 "У полі <guilabel>Приєднати</guilabel> має бути вказано параметри, які "
 "передаються ядру під час завантаження."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1150,8 +1269,8 @@ msgstr ""
 "Якщо буде позначено пункт <guilabel>Основна</guilabel>, Grub завантажуватиме "
 "відповідну систему як основну."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1160,96 +1279,66 @@ msgid ""
 msgstr ""
 "За допомогою додаткового вікна, відкрити яке можна натисканням кнопки "
 "<guilabel>Додатково</guilabel>, <guilabel>Режим відео</guilabel>, "
-"<guilabel>initrd</guilabel> та <guilabel>Мережевий профіль</guilabel>, див. <"
-"xref linkend=\"draknetprofile\"/>, зі спадних списків."
+"<guilabel>initrd</guilabel> та <guilabel>Мережевий профіль</guilabel>, див. "
+"<xref linkend=\"draknetprofile\"/>, зі спадних списків."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Налаштовування автореєстрації"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Ідентифікатор користувача</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
-"<emphasis role=\"bold\">drakboot</emphasis> від імені адміністратора (root)."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"За допомогою цієї програми<placeholder type=\"footnote\" id=\"0\"/> можна "
-"наказати системі завантажуватися до облікового запису того самого "
-"користувача та до того самого стільничного середовища без потреби у введенні "
-"пароля. Така можливість називається автореєстрацією. Зазвичай, такий спосіб "
-"завантаження є зручним, якщо комп’ютером буде користуватися лише один "
-"користувач."
+"За допомогою додаткового вікна, відкрити яке можна натисканням кнопки "
+"<guilabel>Додатково</guilabel>, <guilabel>Режим відео</guilabel>, "
+"<guilabel>initrd</guilabel> та <guilabel>Мережевий профіль</guilabel>, див. "
+"<xref linkend=\"draknetprofile\"/>, зі спадних списків."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Доступ до цієї програми можна отримати за допомогою сторінки <emphasis role="
-"\"bold\">«Завантаження»</emphasis> Центру керування Mageia. Пункт підписано "
-"«Налаштувати автореєстрацію»."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Призначення кнопок інтерфейсу є доволі очевидним:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Позначте пункт <guibutton>Запускати графічну оболонку при завантаженні</"
-"guibutton>, якщо ви хочете запускати систему X Window під час завантаження. "
-"Якщо пункт позначено не буде, система запускатиметься у текстовому режимі. "
-"Втім, графічний інтерфейс можна буде запустити з текстового. Зробити це "
-"можна за допомогою команди «startx» або «systemctl start dm»."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Якщо буде позначено перший пункт, ви отримаєте доступу до двох інших "
-"пунктів. Ви можете вибрати пункт <guibutton>Ні, мені не потрібна автоматична "
-"реєстрація</guibutton>, якщо ви хочете, щоб система продовжувала запитувати "
-"вас про те, до якого з облікових записів користувачів слід увійти, і просити "
-"ввести пароль. Іншим варіантом є позначення пункту <guibutton>Так, я хочу "
-"реєструватися в системі з цим (іменем, стільницею)</guibutton>, у цьому "
-"випадку вам слід вказати значення для пунктів <guilabel>Типовий користувач</"
-"guilabel> і <guilabel>Типова стільниця</guilabel>."
+"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
+"<emphasis role=\"bold\">drakboot</emphasis> від імені адміністратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2696,22 +2785,22 @@ msgstr ""
 "про що йдеться."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Керування розділами диска"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk або diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2722,7 +2811,7 @@ msgstr ""
 "\">diskdrake</emphasis> від імені адміністратора (root)."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2738,7 +2827,7 @@ msgstr ""
 "продовжувати роботу з програмою."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2747,12 +2836,12 @@ msgstr ""
 "потрібний вам жорсткий диск вибором відповідної вкладки (sda, sdb, sdc тощо)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2771,9 +2860,17 @@ msgstr ""
 "розташованих праворуч, можна отримати після натискання розділу на картинці "
 "диска."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2784,13 +2881,13 @@ msgstr ""
 "розділ."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Зміну розмірів розділу можна виконувати лише за рахунок правої межі розділу."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2803,22 +2900,23 @@ msgstr ""
 "<guibutton role=\"bold\">Створити</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Ви можете вибрати точку монтування, якої не існує. Якщо буде здійснено такий "
 "вибір, відповідну точку монтування буде створено."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Натискання кнопки <emphasis><guibutton>Перемкнути в режим експерта</"
@@ -2826,7 +2924,7 @@ msgstr ""
 "визначення мітки розділу, як це показано на наведеному нижче знімку."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7814,13 +7912,14 @@ msgstr "Налаштовування послідовності завантаж
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10807,10 +10906,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Доступ до цього інструмента<placeholder type=\"footnote\" id=\"0\"/> можна "
 "отримати за допомогою сторінки <emphasis role=\"bold\">Система</emphasis> "
@@ -11646,6 +11746,9 @@ msgstr ""
 "підтверджено, вам доведеться вийти з облікового запису і знову увійти до "
 "нього, щоб задіяти внесені зміни."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"