Update XML and templates

1 files changed, 197 insertions, 121 deletions

diff --git a/docs/mcc-help/mcc-help.pot b/docs/mcc-help/mcc-help.pot
index d2345685..7951071d 100644
--- a/docs/mcc-help/mcc-help.pot
+++ b/docs/mcc-help/mcc-help.pot
@@ -8,7 +8,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: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -663,7 +663,71 @@ 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 ""
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+msgid "drakautologin"
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+msgid "drakautologin.png"
+msgstr ""
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+msgid ""
+"You can start this tool from the command line, by typing <emphasis "
+"role=\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+
+#. 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 ""
 
@@ -673,20 +737,20 @@ msgid "drakboot --boot"
 msgstr ""
 
 #. 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 ""
 
 #. 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 ""
 
@@ -698,68 +762,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 "
+"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 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 "
@@ -768,33 +840,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 "
@@ -807,65 +879,77 @@ 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 ""
 
 #. 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 ""
 
-#. 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> "
@@ -873,68 +957,52 @@ msgid ""
 "linkend=\"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"
+#. 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><info><subtitle>
-#: en/drakboot.xml:6
-msgid "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
+msgid "drakboot3.png"
 msgstr ""
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"You can start this tool from the command line, by typing <emphasis "
-"role=\"bold\">drakboot</emphasis> as root."
+"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:15
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 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."
+"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: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\"."
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+msgid "drakboot4.png"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr ""
-
-#. 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'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
 msgstr ""
 
-#. 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>
@@ -2145,22 +2213,22 @@ msgid ""
 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 ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr ""
 
 #. 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 "
@@ -2168,7 +2236,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 "
@@ -2178,19 +2246,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 ""
 
 #. 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, "
@@ -2201,21 +2269,29 @@ msgid ""
 "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 "
@@ -2224,25 +2300,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 ""
 
 #. 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 ""
 
@@ -6251,12 +6327,12 @@ msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
 msgstr ""
 
 #. type: Content of: <section><orderedlist><listitem><para>
@@ -8632,7 +8708,7 @@ msgstr ""
 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 ""
 
 #. type: Content of: <section><para>