Update translation files

27 files changed, 10320 insertions, 6289 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 746bd3ee..69eeb923 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-13 15:13+0000\n"
 "Last-Translator: Davidmp <medipas@gmail.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1289,12 +1289,12 @@ msgstr ""
 "automàticament. De nou, sigueu prudents en les vostres seleccions."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particions personalitzades del disc amb DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1302,7 +1302,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1315,7 +1315,7 @@ msgstr ""
 "literal>. Altrament, el sistema no arrencarà."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1323,7 +1323,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1333,7 +1333,7 @@ msgstr ""
 "n'hi ha tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1342,68 +1342,85 @@ msgstr ""
 "particions del dispositiu d'emmagatzematge seleccionat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Per a totes les altres accions: cliqueu primer a la partició desitjada. "
 "Llavors inspeccioneu-la, o bé trieu-ne un sistema de fitxers i un punt de "
 "muntatge, redimensioneu-la, o bé elimineu-la."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continueu fins que tot sigui del vostre grat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Cliqueu <guibutton>Fet</guibutton> en acabat."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Particions"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1414,7 +1431,7 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1423,7 +1440,7 @@ msgstr ""
 "disposició i contingut del(s) vostre(s) disc(s) dur(s) en particular."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1432,12 +1449,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Utilitza les particions existents"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1446,12 +1463,12 @@ msgstr ""
 "compatibles amb Linux i es podrien fer servir per a la instal·lació."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Utilitza l'espai lliure"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1460,12 +1477,12 @@ msgstr ""
 "instal·lació de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Utilitza l'espai lliure en una partició Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1474,7 +1491,7 @@ msgstr ""
 "l'instal·lador us proposi utilitzar-la."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1485,7 +1502,7 @@ msgstr ""
 "una còpia de seguretat dels fitxers importants."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1503,7 +1520,7 @@ msgstr ""
 "personals."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1512,32 +1529,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Esborra i utilitza el disc sencer."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Aquesta opció utilitzarà tota la unitat per a Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Nota! Això esborrarà TOTES les dades del disc dur seleccionat. Vigileu!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1547,12 +1564,13 @@ msgstr ""
 "teniu dades al disc que no voleu perdre, llavors no feu servir aquesta opció."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Personalitzat"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Particions personalitzades del disc amb DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1561,70 +1579,71 @@ msgstr ""
 "al(s) disc(s) dur(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Si feu servir un sistema de llegat (Legacy, coneguts com a CSB o BIOS) amb "
 "un disc GPT, heu de crear una partició d'arrencada, boot, si no existeix. És "
@@ -1634,23 +1653,28 @@ msgstr ""
 "\" com a tipus de sistema de fitxers."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1670,17 +1694,17 @@ msgstr ""
 "gparted, i feu servir la configuració següent:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Alinea a\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Espai lliure que precedeix a (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1715,7 +1739,8 @@ msgstr "Documentació oficial de Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1731,7 +1756,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1743,7 +1768,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1799,14 +1824,14 @@ msgstr "Enhorabona"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1816,7 +1841,7 @@ msgstr ""
 "és segur treure el suport d'instal·lació i arrencar de nou l'ordinador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1825,7 +1850,7 @@ msgstr ""
 "entre els diversos sistemes operatius instal·lats (si n'hi ha més d'un)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1834,12 +1859,12 @@ msgstr ""
 "automàticament la instal·lació Mageia i s'iniciarà."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Gaudiu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1847,6 +1872,92 @@ msgstr ""
 "Visiteu www.mageia.org si teniu algun dubte o voleu col·laborar amb Mageia."
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis>Proveïdor</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Genèric</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatació"
@@ -1915,12 +2026,12 @@ msgstr ""
 "per a continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'instal·lador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1931,7 +2042,7 @@ msgstr ""
 "instal·lació o actualització tan fàcil com sigui possible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1939,70 +2050,76 @@ msgstr ""
 "La pantalla del menú inicial té diverses opcions, però l'opció "
 "predeterminada engegarà l'instal·lador, que normalment és tot el que cal."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de benvinguda de la instal·lació"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Ús del gestor d'arrencada de Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "A partir d'aquesta primera pantalla, és possible establir algunes "
 "preferències personals:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Utilitzeu les tecles de les fletxes per a seleccionar l'idioma i premeu la "
 "tecla de retorn."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2010,57 +2127,47 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
-msgstr ""
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Per defecte, no altera res en les opcions per defecte."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Paràmetres segurs, es dóna prioritat a les opcions més segures, en "
-"detriment del rendiment."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2068,8 +2175,8 @@ msgstr ""
 "- Sense ACPI (Advanced Configuration and Power Interface), no es té en "
 "compte la gestió del consum."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2077,50 +2184,50 @@ msgstr ""
 "- Sense APIC local (Local Advanced Programmable Interrupt Controller), sobre "
 "interrupcions de la CPU, seleccioneu aquesta opció si us la demana."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2128,35 +2235,40 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
-msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Amb la tecla F2 l'ajuda es tradueix a l'idioma seleccionat."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2164,27 +2276,24 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "La disposició del teclat és l'americana."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Els passos de la instal·lació"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2193,7 +2302,7 @@ msgstr ""
 "veure en el plafó lateral de la pantalla."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2203,7 +2312,7 @@ msgstr ""
 "habituals."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2212,7 +2321,7 @@ msgstr ""
 "dóna més explicacions sobre el pas actual."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2232,18 +2341,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton>. Després premeu alhora <guibutton>Alt "
 "Ctrl Delete </guibutton> per a reiniciar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemes en la instal·lació i possibles solucions"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Sense interfície gràfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2255,7 +2364,7 @@ msgstr ""
 "consola."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2264,13 +2373,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "La instal·lació es penja"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2284,13 +2393,13 @@ msgstr ""
 "<code>noauto</code> a la consola. Si cal, aquesta opció es pot combinar amb "
 "d'altres."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problema en la RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2303,13 +2412,13 @@ msgstr ""
 "la quantitat correcta de RAM. Per exemple, <code>mem=256M</code> "
 "significaria 256 MB de RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Particions dinàmiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3802,12 +3911,12 @@ msgstr ""
 "disposicions de teclat llatines i no llatines."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Trieu un idioma per usar"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3818,7 +3927,18 @@ msgstr ""
 "selecció durant la instal·lació i per al sistema instal·lat."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Seleccioneu l'idioma preferit, desplegant primer la llista corresponent al "
+"vostre continent. <application>Mageia</application> farà servir aquesta "
+"selecció durant la instal·lació i per al sistema instal·lat."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3831,16 +3951,22 @@ msgstr ""
 "afegir els idiomes extres un cop feta la instal·lació."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3851,7 +3977,7 @@ msgstr ""
 "seleccionat a la pantalla de múltiples idiomes."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -3860,12 +3986,12 @@ msgstr ""
 "és recomanable instal·lar també l'idioma del vostre teclat."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3873,7 +3999,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3925,19 +4051,19 @@ msgstr ""
 "botons o més."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Addició o modificació d'una entrada al menú d'arrencada"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4600,3 +4726,32 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
+#~ msgid "Custom"
+#~ msgstr "Personalitzat"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Paràmetres segurs, es dóna prioritat a les opcions més segures, en "
+#~ "detriment del rendiment."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 3930c173..2daa1d00 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-11 07:28+0000\n"
 "Last-Translator: fri\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1365,12 +1365,12 @@ msgstr ""
 "výběru konzervativní."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Vlastní rozdělení disku pomocí DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1381,7 +1381,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1394,7 +1394,7 @@ msgstr ""
 "literal>, jinak váš systém nebude možné zavést."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1405,7 +1405,7 @@ msgstr ""
 "se podívat, co je na něm, předtím než začnete."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1414,7 +1414,7 @@ msgstr ""
 "je zařízení USB. Například sda, sdb a sdc, pokud jsou připojena tři."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1423,28 +1423,32 @@ msgstr ""
 "vybraném úložném zařízení."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Pro všechky ostatní činnosti: klepněte nejprve na požadovaný oddíl. Potom si "
 "jej prohlédněte, nebo si vyberte souborový systém a přípojný bod, změňte "
 "jeho velikost nebo jej vymažte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Pokračujte dokud jste nenastavil vše podle vašeho přání."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Klepněte na tlačítko <guibutton>Hotovo</guibutton>, když jste připraven."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1453,50 +1457,54 @@ msgstr ""
 "Partition) existuje a je připojen v /boot/EFI (více níže)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Pokud instalujete Mageiu na systém Legacy/GPT, zkontrolujte, že zaváděcí "
 "oddíl BIOS je přítomen se správným typem"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Rozdělení disku"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1507,7 +1515,7 @@ msgstr ""
 "nainstalovat <application>Mageiu</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1516,7 +1524,7 @@ msgstr ""
 "rozložení a obsahu vašeho konkrétního pevného disku."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1529,12 +1537,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Použít existující oddíly"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1543,12 +1551,12 @@ msgstr ""
 "kompatibilní oddíly a tyto mohou být použity pro instalaci."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Použít volné místo"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1557,12 +1565,12 @@ msgstr ""
 "využije pro novou instalaci Mageii."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Použít volné místo na oddílu Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1571,7 +1579,7 @@ msgstr ""
 "může nabídnout jeho použití."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1582,7 +1590,7 @@ msgstr ""
 "zazálohovány všechny důležité soubory!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1598,7 +1606,7 @@ msgstr ""
 "použita. Velice se doporučuje provedení zálohy vašich osobních souborů."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1611,12 +1619,13 @@ msgstr ""
 "přesunutím mezery mezi oběma oddíly. Viz snímek obrazovky níže."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1624,22 +1633,22 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Smazat a použít celý disk"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Tato volba použije celé diskové zařízení pro Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "Pozor, toto smaže všechna data na vybraném disku. Buďte opatrní!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1649,12 +1658,13 @@ msgstr ""
 "disku, která nejste připraveni ztratit, potom tuto volbu nepoužívejte."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Vlastní"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Vlastní rozdělení disku pomocí DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1663,19 +1673,20 @@ msgstr ""
 "(resp. discích)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Měnění velikostí oddílů:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "Instalátor rozdělí dostupné místo podle následujících pravidel:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1684,30 +1695,30 @@ msgstr ""
 "oddíl pro /, nebude tu žádný samostatný oddíl pro /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr "Pokud je celkové dostupné místo nad 50 GB, potom se vytvoří tři oddíly"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 z celkového dostupného místa je přideleno pro / , nanejvýš však 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 je přiděleno pro swap , nanejvýš však 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "zbytek (přinejmenším 12/19) je přiděleno pro /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1716,12 +1727,13 @@ msgstr ""
 "tři oddíly: 50 GB pro /, 4 GB pro swap a zbytek pro adresář /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Pokud používáte systém UEFI, ESP (systémový oddíl EFI) bude automaticky "
 "rozpoznán, nebo vytvořen, pokud ještě neexistuje, a připojen na /boot/EFI. "
@@ -1729,22 +1741,22 @@ msgstr ""
 "provedeno správně."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1752,7 +1764,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1761,7 +1773,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1780,17 +1792,17 @@ msgstr ""
 "gparted, pokud vlastníte takové zařízení, a použít následující nastavení:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Zarovnat na\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Předcházející volné místo (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1824,7 +1836,8 @@ msgstr "Oficiální dokumentace pro Mageiu"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1840,7 +1853,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1852,7 +1865,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1908,7 +1921,7 @@ msgstr "Gratulujeme"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1917,7 +1930,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1927,7 +1940,7 @@ msgstr ""
 "je bezpečné vyjmout instalační médium a restartovat počítač."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1936,7 +1949,7 @@ msgstr ""
 "ve vašem počítači (pokud jich máte víc než jeden)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1945,12 +1958,12 @@ msgstr ""
 "vybrána a spuštěna vaše nainstalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Bavte se!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1959,6 +1972,92 @@ msgstr ""
 "do Mageii"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Měnění velikostí oddílů:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Všeobecný</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formátování"
@@ -2033,12 +2132,12 @@ msgstr ""
 "pokračování."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalátor Mageii"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2049,7 +2148,7 @@ msgstr ""
 "je to možné."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2057,51 +2156,56 @@ msgstr ""
 "Počáteční nabídková obrazovka má různé možnosti, každopádně předvolená "
 "spustí instalátor, který bude obyčejně mít vše, co potřebujete."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Uvítací instalační obrazovka"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Použití zavaděče Mageii"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Zde jsou výchozí uvítací obrazovky, při používaní DVD Mageia. První je se "
 "zastaralým systémem a druhá se systémem UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "Na této první obrazovce je možné nastavit některá osobní nastavení:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2109,22 +2213,22 @@ msgstr ""
 "Jazyk (jen pro instalaci, může se odlišovat od zvoleného systémového jazyka) "
 "stisknutím klávesy F2 (jen v zastaralém režimu)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Použijte šipkové klávesy pro výběr jazyka a stiskněte klávesu Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2136,32 +2240,31 @@ msgstr ""
 "systém</guilabel>, <guilabel>Paměťový test</guilabel> a <guilabel>Nástroj na "
 "zjištění vybavení počítače</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Změňte rozlišení obrazovky stisknutím klávesy F3 (jen v zastaralém režimu)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2171,8 +2274,8 @@ msgstr ""
 "\">F6</emphasis> v zastaralém režimu nebo klávesy <emphasis role=\"bold\">e</"
 "emphasis> v režimu UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2182,22 +2285,13 @@ msgstr ""
 "možností navíc. Nabídka vyvolaná přes F6 zobrazuje nový řádek nazvaný "
 "<guilabel>Volby pro zavedení</guilabel> a nabízí čtyři položky:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Výchozí, tato nemění nic ve výchozích volbách."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Bezpečná nastavení, přednost je dána bezpečnějším volbám na úkor "
-"výkonnosti."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2205,8 +2299,8 @@ msgstr ""
 "- Žádné ACPI (pokročilé rozhraní nastavení a napájení), správa napájení není "
 "brána do úvahy."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2214,8 +2308,8 @@ msgstr ""
 "- Žádný místní APIC (lokální pokročilý programovatelný ovladač přerušení), "
 "jedná se o přerušení CPU, vyberte tuto volbu, pokud jste k tomu vyzváni."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2223,8 +2317,8 @@ msgstr ""
 "Když si vyberete jednu z těchto položek, tato změní výchozí volby zobrazené "
 "v řádku <guilabel>Volby zavádění systému</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2234,26 +2328,27 @@ msgstr ""
 "neobjevují v řádku <guilabel>Volby zavádění systému</guilabel>, avšak ve "
 "skutečnosti jsou brány do úvahy."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Přidejte více voleb pro kernel stisknutím klávesy F1 (jen v zastaralém "
 "režimu)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2261,17 +2356,17 @@ msgstr ""
 "jednu šipkovými klávesami a stiskněte klávesu Enter pro obdržení více "
 "podrobností nebo stiskněte klávesu Esc pro návrat na uvítací obrazovku."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2283,22 +2378,22 @@ msgstr ""
 "volby mohou být přidány ručně v řádku <guilabel>Volby zavádění systému</"
 "guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Nápověda je přeložena ve zvoleném jazyku pomocí klávesy F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2309,17 +2404,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Zde je výchozí uvítací obrazovka při používání instalačního CD založeného na "
 "připojení k síti (obrazy Boot.iso nebo Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2331,27 +2432,24 @@ msgstr ""
 "podívejte na <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
 "\">Mageia Wiki</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Rozložení klávesnice je americké."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Instalační kroky"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2360,7 +2458,7 @@ msgstr ""
 "bočním panelu obrazovky."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2369,7 +2467,7 @@ msgstr ""
 "<guibutton>Pokročilé</guibutton> s obyčejně méně žádanými možnostmi navíc."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2378,7 +2476,7 @@ msgstr ""
 "bližší vysvětlení aktuálního kroku."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2398,18 +2496,18 @@ msgstr ""
 "současného stisknutí tří kláves <guibutton>Alt+Ctrl+F2</guibutton>. Potom "
 "současně stiskněte <guibutton>Alt+Ctrl+Delete</guibutton> pro restart."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy při instalaci a možné řešení"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Bez grafického rozhraní"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2420,7 +2518,7 @@ msgstr ""
 "rozlišení obrazovky napsáním <code>vgalo</code> v příkazovém řádku."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2434,13 +2532,13 @@ msgstr ""
 "Bude vám nabídnuta černá obrazovka se slovem \"boot\". Napište \"text\" a "
 "stiskněte ENTER. Nyní pokračujte instalací v textovém režimu."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Instalace zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2454,13 +2552,13 @@ msgstr ""
 "chcete vyzkoušet, napište <code>noauto</code> v příkazovém řádku. Tato volba "
 "může být, když je třeba, též spojena i s jinými volbami."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problém paměti RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2472,13 +2570,13 @@ msgstr ""
 "<code>mem=xxxM</code>, kde xxx je správné množství paměti RAM, např. "
 "<code>mem=256M</code> by znamenalo 256 MB RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamické oddíly"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4122,12 +4220,12 @@ msgstr ""
 "latinským a nelatinským rozložením klávesnice."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Zvolte si, prosím, jazyk, který chcete používat"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4138,7 +4236,18 @@ msgstr ""
 "instalace a pro váš instalovaný systém."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Vyberte si váš oblíbený jazyk, tím že nejprve rozbalíte seznam pro váš "
+"světadíl. <application>Mageia</application> použije tento výběr během "
+"instalace a pro váš instalovaný systém."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4151,10 +4260,11 @@ msgstr ""
 "náročné přidat další jazykovou podporu po instalaci."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4164,7 +4274,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4175,7 +4285,7 @@ msgstr ""
 "též označen jako vybraný na obrazovce s vícero jazyky."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4184,12 +4294,12 @@ msgstr ""
 "potom se doporučuje nainstalovat stejně tak jazyk vaší klávesnice."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia používá jako výchozí podporu pro UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4200,7 +4310,7 @@ msgstr ""
 "jazyky."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4255,19 +4365,19 @@ msgstr ""
 "více tlačítek."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Přidaní nebo změna položky v nabídce zavaděče"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5013,3 +5123,50 @@ msgid ""
 msgstr ""
 "Dalším krokem je kopírování souborů na pevný disk. Toto zabere několik "
 "minut. Na konci dostanete na určitý čas prázdnou obrazovku. To je normální."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Vlastní"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Bezpečná nastavení, přednost je dána bezpečnějším volbám na úkor "
+#~ "výkonnosti."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index d402a97f..bf65d9a3 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-04 15:43+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1415,12 +1415,12 @@ msgstr ""
 "Nochmal: es ist besser eher zu niedrige Einstellungen zu wählen."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Benutzerdefinierte Laufwerkspartitionierung mit DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1431,7 +1431,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1445,7 +1445,7 @@ msgstr ""
 "emphasis> gesetzt werden, da sonst das System nicht gebootet werden kann."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1457,7 +1457,7 @@ msgstr ""
 "anfangen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1467,7 +1467,7 @@ msgstr ""
 "und <emphasis>sdc</emphasis>, wenn drei Laufwerke gefunden wurden."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1476,10 +1476,14 @@ msgstr ""
 "gewählten Laufwerks zu löschen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "<emphasis role=\"bold\">Für alle anderen Aktionen:</emphasis> Klicken Sie "
 "zuerst auf die gewünschte Partition. Dann sehen Sie sich den Inhalt an "
@@ -1487,19 +1491,19 @@ msgstr ""
 "ändern Sie die Größe oder löschen Sie die Partition."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Wiederholen Sie diesen Vorgang für alle Laufwerke, bis alle Einstellungen "
 "Ihren Wünschen entsprechen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Ist alles bereit, so klicken Sie auf <guibutton>Fertig</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1509,50 +1513,54 @@ msgstr ""
 "ist (siehe unten)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Falls Sie Mageia auf einem Legacy/GPT System installieren, überprüfen Sie "
 "das eine BIOS Bootpartition mit dem richtigen Dateisystemtyp vorhanden ist"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partitionierung"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1563,7 +1571,7 @@ msgstr ""
 "<application>Mageia</application> vorschlägt."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1572,7 +1580,7 @@ msgstr ""
 "Festplatte(n)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1585,12 +1593,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Verwende vorhandene Partitionen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1599,12 +1607,12 @@ msgstr ""
 "Partitionen gefunden und können für die Installation genutzt werden."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Nutze freien Speicherplatz"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1613,12 +1621,12 @@ msgstr ""
 "dann wird diese Option diesen für die neue Mageia-Installation verwenden."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Nutze den freien Speicherplatz einer Windows Partition"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1627,7 +1635,7 @@ msgstr ""
 "Partition verfügbar haben, kann der Installer diesen zur Nutzung vorschlagen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1639,7 +1647,7 @@ msgstr ""
 "Datenträger gesichert sind."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1657,7 +1665,7 @@ msgstr ""
 "die persönlichen Daten vor dem Vorgang zu sichern."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1672,12 +1680,13 @@ msgstr ""
 "dazu den Screenshot unten."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1685,24 +1694,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Komplette Platte löschen und freien Platz benutzen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Diese Option wird das vollständige Laufwerk für Mageia nutzen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Beachte! Dies wird ALLE Daten auf dem gewählten Laufwerk löschen. Bitte "
 "Vorsicht walten lassen!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1713,12 +1722,13 @@ msgstr ""
 "dürfen, dann nutzen Sie bitte nicht diese Option."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Benutzerdefiniert"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Benutzerdefinierte Laufwerkspartitionierung mit DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1727,12 +1737,13 @@ msgstr ""
 "Installation auf den Festplatten."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1741,7 +1752,7 @@ msgstr ""
 "aufteilen:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1750,7 +1761,7 @@ msgstr ""
 "eine Partition für / erstellt und keine separate Partition für /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1758,7 +1769,7 @@ msgstr ""
 "Partitionen erstellt"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1766,17 +1777,17 @@ msgstr ""
 "maximalen Größe von 50 GB "
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 wird swap zugewiesen mit einer maximalen Größe von 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "der Rest (die übrigen 12/19) wird /home zugewiesen."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1786,12 +1797,13 @@ msgstr ""
 "der Rest für /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Wenn Sie ein UEFI System nutzen, wird die ESP (EFI System Partition) "
 "automatisch erkannt oder erstellt, falls diese noch nicht vorhanden ist, und "
@@ -1799,13 +1811,14 @@ msgstr ""
 "Möglichkeit um nachzuprüfen, ob dies erfolgreich durchgeführt wurde."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem GPT-"
 "Laufwerk verwenden, müssen Sie eine BIOS Bootpartition erstellen, falls noch "
@@ -1815,12 +1828,12 @@ msgstr ""
 "Partitionen geschieht. Wähle als Dateisystem \"BIOS boot partition\" aus."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1828,7 +1841,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1837,7 +1850,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1856,17 +1869,17 @@ msgstr ""
 "folgende Einstellungen zu partitionieren:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Ausrichten an:\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Vorhergehender freier Speicherplatz (MiB):\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1901,7 +1914,8 @@ msgstr "Die offizielle Mageia-Dokumentation"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1917,7 +1931,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1929,7 +1943,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1987,7 +2001,7 @@ msgstr "Herzlichen Glückwunsch!"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1996,7 +2010,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -2007,7 +2021,7 @@ msgstr ""
 "Computer neu starten können."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -2017,7 +2031,7 @@ msgstr ""
 "ist)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2026,12 +2040,12 @@ msgstr ""
 "von Ihnen installierte Mageia automatisch gewählt und gestartet."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Viel Vergnügen!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2040,6 +2054,92 @@ msgstr ""
 "mitarbeiten wollen."
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitionsaufteilung:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generisch</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatieren"
@@ -2119,12 +2219,12 @@ msgstr ""
 "guibutton>, um mit der Installation fortzufahren."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, das Mageia Installationsprogramm"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2135,7 +2235,7 @@ msgstr ""
 "Installation oder eine Aktualisierung so leicht wie möglich macht."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2144,53 +2244,58 @@ msgstr ""
 "Option das Installationsprogramm startet. Normalerweise ist dies alles, was "
 "Sie tun müssen."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Willkommensbildschirm der Installation"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Verwenden des Mageia Bootloaders"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Hier sehen Sie die voreingestellten Willkommensbildschirme beim benutzen der "
 "Mageia DVD. Der erste verwendet das alte System, der zweite das UEFI-System:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Von diesem ersten Fenster aus, ist es möglich, einige persönliche "
 "Einstellungen vorzunehmen:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2198,24 +2303,24 @@ msgstr ""
 "Die Sprache (nur für die Installation, diese kann eine andere als die für "
 "das System sein) durch drücken der F2 Taste (nur im Legacy Modus)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Verwende die Pfeiltasten um die Sprache auszuwählen und drücke danach die "
 "Enter Taste."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2227,33 +2332,32 @@ msgstr ""
 "<guilabel>Rettungssystem</guilabel>, <guilabel>Speichertest</guilabel> und "
 "<guilabel>Hardware-Erkennungswerkzeug</guilabel> enthält."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Ändere die Bildschirmauflösung durch drücken der F3 Taste (nur im Legacy "
 "Modus)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2263,8 +2367,8 @@ msgstr ""
 "alten Modus oder der Taste <emphasis role=\"bold\">e</emphasis> im UEFI-"
 "Modus einige Kernel-Optionen hinzu."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2275,22 +2379,13 @@ msgstr ""
 "eine neue Zeile, welche <guilabel>Boot-Optionen</guilabel> heißt und vier "
 "Einträge enthält:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Standard, es ändert nichts an den Standardoptionen."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Sichere Einstellungen, die Priorität wird auf sichere Optionen gelegt zum "
-"Nachteil der Leistung."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2298,8 +2393,8 @@ msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), die "
 "Stromsparfunktion wird nicht berücksichtigt."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2308,8 +2403,8 @@ msgstr ""
 "geht um die CPU Unterbrechung, wähle die Option wenn Sie danach gefragt "
 "werden."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2317,8 +2412,8 @@ msgstr ""
 "Wenn Sie einen dieser Einträge auswählen, werden die Standard Bootoptionen "
 "in der <guilabel>Bootoptionen</guilabel> Zeile geändert."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2329,26 +2424,27 @@ msgstr ""
 "<guilabel>Bootoptionen</guilabel> Zeile erscheinen, diese werden allerdings "
 "trotzdem befolgt."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Fügen Sie weitere Kerneloptionen hinzu indem Sie die F1 Taste drücken (nur "
 "im Legacy Modus)"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2357,17 +2453,17 @@ msgstr ""
 "mehr Details zu bekommen oder drücke ESC um in den Willkommensbildschirm "
 "zurückzukehren."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2379,23 +2475,23 @@ msgstr ""
 "gelangen. Die dort aufgeführten Optionen können mit der Hand in die "
 "<guilabel>Boot-Optionen</guilabel> Zeile hinzugefügt werden."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Die Hilfe wird in der, mit der F2 Taste, ausgewählten Sprache angezeigt."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2406,18 +2502,24 @@ msgstr ""
 "Wie_man_Kerneloptionen_einstellt\">https://wiki.mageia.org/de/"
 "Wie_man_Kerneloptionen_einstellt</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Hier sehen Sie den Standard Willkommensbildschirm, wenn eine "
 "netzwerkbasierte Installations CD (Boot.iso oder Boot-Nonfree-iso) verwendet "
 "wird."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2429,27 +2531,24 @@ msgstr ""
 "Verwendung einer netzbasierten Installations CD, schau <link ns2:href="
 "\"https://wiki.mageia.org/en/Boot.iso_install\">ins Mageia Wiki</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Das Tastaturlayout ist das amerikanische."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Die Installationsschritte"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2458,7 +2557,7 @@ msgstr ""
 "linken Seite des Bildschirms verfolgt werden können."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2468,7 +2567,7 @@ msgstr ""
 "zusätzlichen Optionen haben."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2477,7 +2576,7 @@ msgstr ""
 "über den Sie weitere Erklärungen zum momentan ausgeführten Schritt erhalten."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2499,18 +2598,18 @@ msgstr ""
 "\">Alt+Strg+F2</emphasis>. Anschließend betätigen Sie <emphasis role=\"bold"
 "\">Alt+Strg+Entf</emphasis>, um einen Neustart auszulösen."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsprobleme und mögliche Lösungen"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Keine grafische Schnittstelle"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2522,7 +2621,7 @@ msgstr ""
 "code> eingeben."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2537,13 +2636,13 @@ msgstr ""
 "\"boot:\" angezeigt. Gebe \"text\" ein und drücke Enter. Nun wird die "
 "Installation im Textmodus fortgesetzt."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Die Installation friert ein"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2560,13 +2659,13 @@ msgstr ""
 "Option kann auch mit anderen Optionen kombiniert werden, falls dies nötig "
 "ist."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM Problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2580,13 +2679,13 @@ msgstr ""
 "korrekten Wert des RAM-Speichers darstellt. Z.B.  <emphasis><code>mem=256M</"
 "code></emphasis> bestimmt eine Größe von 256MB RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamische Partitionen"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4277,12 +4376,12 @@ msgstr ""
 "lateinischen und nicht-lateinischen Tastaturbelegungen umschalten möchten."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Bitte wählen Sie eine Sprache für die Installation"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4295,7 +4394,20 @@ msgstr ""
 "System."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Wählen Sie die von Ihnen bevorzugte Sprache, indem Sie zuerst die Liste für "
+"Ihren Kontinent aufklappen. Beachten Sie dabei auch, dass einige Sprachen "
+"auch mehrere Dialekte enthalten können. <application>Mageia</application> "
+"verwendet diese Auswahl für das Installationsprogramm und das installierte "
+"System."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4309,10 +4421,11 @@ msgstr ""
 "komplexer, erst nach der Installation weitere Sprachen hinzuzufügen."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4322,7 +4435,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4333,7 +4446,7 @@ msgstr ""
 "wird dann am Bildschirm für mehrere Sprachen als gewählt markiert."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4343,12 +4456,12 @@ msgstr ""
 "zu wählen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia verwendet standardmäßig die UTF-8 (Unicode) Unterstützung."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4359,7 +4472,7 @@ msgstr ""
 "wirkt sich auf alle installierten Sprachen aus."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4415,12 +4528,12 @@ msgstr ""
 "Multifunktionsmaus zu konfigurieren."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Hinzufügen oder ändern eines Boot Menü Eintrags"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4430,7 +4543,7 @@ msgstr ""
 "Repositorys)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5240,3 +5353,50 @@ msgstr ""
 "Der nächste Schritt ist das kopieren der Dateien auf die Festplatte. Dies "
 "dauert einige Minuten. Am Ende erhalten Sie für eine gewisse Zeit einen "
 "leeren Bildschirm, was normal ist."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Benutzerdefiniert"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Sichere Einstellungen, die Priorität wird auf sichere Optionen gelegt "
+#~ "zum Nachteil der Leistung."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/el.po b/docs/installer/el.po
index 49b4f7db..0f0bb946 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-01 18:42+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -1387,12 +1387,12 @@ msgstr ""
 "είστε συντηρητικοί στις επιλογές σας."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Προσαρμοσμένη κατάτμηση δίσκων με το DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1403,7 +1403,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1416,7 +1416,7 @@ msgstr ""
 "δεν θα είναι δυνατή η εκκίνηση του υπολογιστή σας."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1428,7 +1428,7 @@ msgstr ""
 "περιεχόμενό της πριν να ξεκινήσετε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1438,7 +1438,7 @@ msgstr ""
 "τρία από αυτά."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1447,27 +1447,31 @@ msgstr ""
 "τις κατατμήσεις στην επιλεγμένη συσκευή αποθήκευσης"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Για τις υπόλοιπες ενέργειες: κάντε κλικ στην επιθυμητή κατάτμηση πρώτα. Στη "
 "συνέχεια δείτε την, ή επιλέξτε ένα σύστημα αρχείων και ένα σημείο "
 "προσάρτησης, αλλάξτε το μέγεθός της ή καθαρίστε την."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Συνεχίστε έως ότου ρυθμίσετε οτιδήποτε επιθυμείτε."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Κάντε κλικ στο <guibutton>Έγινε</guibutton> όταν είστε έτοιμος-η."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1477,50 +1481,54 @@ msgstr ""
 "στο /boot.EFI (δείτε κατωτέρω)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Αν κάνετε εγκατάσταση της Mageia σε ένα σύστημα παλιό/GPT σύστημα, ελέγξτε "
 "ότι μια κατάτμηση εκκίνησης BIOS είναι παρούσα με έναν σωστό τύπο"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Διαμερισμός"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1531,7 +1539,7 @@ msgstr ""
 "μέρη εγκατάστασης της <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1540,7 +1548,7 @@ msgstr ""
 "ιδιότητες των σκληρών σας δίσκων και το περιεχόμενό τους."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1553,12 +1561,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Χρήση των υπαρχουσών κατατμήσεων"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1567,12 +1575,12 @@ msgstr ""
 "συμβατές με το Linux και μπορούν να χρησιμοποιηθούν για την εγκατάσταση."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Χρήση του ελεύθερου χώρου"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1581,12 +1589,12 @@ msgstr ""
 "θα τον χρησιμοποιήσει για τη νέα σας εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Χρήση του ελεύθερου χώρου σε μια κατάτμηση των Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1595,7 +1603,7 @@ msgstr ""
 "οδηγός εγκατάστασης μπορεί να σας επιτρέψει να τον χρησιμοποιήσετε."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1605,7 +1613,7 @@ msgstr ""
 "εγκατάσταση της Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1624,7 +1632,7 @@ msgstr ""
 "αρχείων. Θα πρέπει να το ελέγξετε προσεκτικά πριν συνεχίσετε."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1638,12 +1646,13 @@ msgstr ""
 "διαστήματος μεταξύ των δυο κατατμήσεων. Δείτε στο παρακάτω στιγμιότυπο."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1651,24 +1660,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Διαγραφή και χρήση ολόκληρου του δίσκου."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Αυτή η επιλογή θα χρησιμοποιήσει ολόκληρο τον δίσκο για τη Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Προσοχή! Αυτή η ενέργεια θα διαγράψει ΟΛΑ τα δεδομένα στον επιλεγμένο σκληρό "
 "δίσκο. Να είστε προσεκτικός-ή!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1679,12 +1688,13 @@ msgstr ""
 "τότε μην χρησιμοποιήσετε αυτήν την επιλογή."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Προσαρμοσμένο"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Προσαρμοσμένη κατάτμηση δίσκων με το DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1693,13 +1703,14 @@ msgstr ""
 "σας δίσκους."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 "<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1708,7 +1719,7 @@ msgstr ""
 "ακόλουθων κανόνων:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1717,7 +1728,7 @@ msgstr ""
 "μόνο η ριζική κατάτμηση «/» και δεν θα"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1725,7 +1736,7 @@ msgstr ""
 "δημιουργούνται τρεις κατατμήσεις"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1733,21 +1744,21 @@ msgstr ""
 "μέγιστο χώρο 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 "1/19 του συνολικού διαθέσιμου χώρου εκχωρούνται στην κατάτμηση «swap» με "
 "μέγιστο χώρο 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 "και το υπόλοιπο (τουλάχιστον 12/19) εκχωρείται στον προσωπικό κατάλογο «/"
 "home» "
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1757,12 +1768,13 @@ msgstr ""
 "και το υπόλοιπο για το /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Αν χρησιμοποιείτε ένα σύστημα UEFI, το ESP (EFI System Partition) θα "
 "εντοπιστεί αυτομάτως, η αν δεν υπάρχει θα δημιουργηθεί, και θα προσαρτηθεί "
@@ -1770,13 +1782,14 @@ msgstr ""
 "έλεγχο επικύρωσης."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Αν χρησιμοποιείτε ένα παλιό σύστημα (γνωστό και ως CSM ή BIOS) με δίσκο GPT, "
 "χρειάζεστε να δημιουργήσετε μια κατάτμηση εκκίνησης Bios αν δεν υφίσταται. "
@@ -1786,12 +1799,12 @@ msgstr ""
 "κατάτμηση εκκίνησης BIOS ως τύπο συστήματος αρχείων."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1799,7 +1812,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1808,7 +1821,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1828,17 +1841,17 @@ msgstr ""
 "χρησιμοποιήσετε την παρακάτω διαμόρφωση:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Στοίχιση σε\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1873,7 +1886,8 @@ msgstr "Η επίσημη τεκμηρίωση της Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1890,7 +1904,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1902,7 +1916,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1959,7 +1973,7 @@ msgstr "Συγχαρητήρια"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1968,7 +1982,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1978,7 +1992,7 @@ msgstr ""
 "τώρα να επανεκκινήσετε τον υπολογιστή σας με ασφάλεια."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1988,7 +2002,7 @@ msgstr ""
 "περισσότερα από ένα)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1997,12 +2011,12 @@ msgstr ""
 "σας της Mageia θα επιλεχθεί αυτόματα και θα εκκινηθεί."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Απολαύστε!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2011,6 +2025,93 @@ msgstr ""
 "συνεισφέρετε στη Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Διαμόρφωση του μεγέθους των κατατμήσεων:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Γενικού τύπου</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Μορφοποίηση"
@@ -2088,12 +2189,12 @@ msgstr ""
 "guibutton> για να συνεχίσετε."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, ο οδηγός εγκατάστασης της Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2105,7 +2206,7 @@ msgstr ""
 "ευκολότερα."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2113,53 +2214,58 @@ msgstr ""
 "Το μενού της αρχικής οθόνης έχει διάφορες επιλογές, η προκαθορισμένη θα "
 "εκκινήσει τον οδηγό εγκατάστασης, και τυπικά είναι αυτό που χρειαζόσαστε."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Η πρώτη οθόνη καλωσορίσματος στην εγκατάσταση"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Χρήση της Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Αυτές είναι οι εξ ορισμού οθόνες καλωσορίσματος κατά τη χρήση ενός Mageia "
 "DVD· η πρώτη με ένα παλαιό σύστημα και η δεύτερη με ένα σύστημα UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Από αυτή την πρώτη οθόνη, είναι δυνατό να ορίσετε μερικές προσωπικές "
 "προτιμήσεις:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2168,22 +2274,22 @@ msgstr ""
 "γλώσσα του συστήματος) πατώντας το πλήκτρο F2 (μόνο σε λειτουργία παλαιού "
 "τύπου)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Χρησιμοποιήστε τα βελάκια για να επιλέξετε τη γλώσσα και πιέστε Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2195,33 +2301,32 @@ msgstr ""
 "συστήματος</guilabel>, <guilabel>Έλεγχο μνήμης</guilabel> και το "
 "<guilabel>Εργαλείο εντοπισμού υλικού</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Αλλαγή της ανάλυσης της οθόνης πιέζοντας το πλήκτρο F3 (μόνο σε λειτουργία "
 "παλαιού τύπου)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2231,8 +2336,8 @@ msgstr ""
 "\"bold\">F6</emphasis> για τη λειτουργία παλαιού τύπου ή το πλήκτρο "
 "<emphasis role=\"bold\">e</emphasis> για τη λειτουργία UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2243,22 +2348,13 @@ msgstr ""
 "εμφανίζει μια νέα γραμμή με τις <guilabel>Επιλογές του πυρήνα</guilabel> και "
 "υπάρχουν διαθέσιμες τέσσερις επιλογές:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Προκαθορισμένη, δεν αλλάζει καμιά από τις εξ ορισμού επιλογές."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Ασφαλές ρυθμίσεις, δίνεται προτεραιότητα στις επισφαλές επιλογές σε βάρος "
-"της απόδοσης."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2266,8 +2362,8 @@ msgstr ""
 "- Χωρίς ACPI : Advanced Configuration and Power Interface, η εξελιγμένη "
 "διεπαφή ρύθμισης και διαχείρισης ενέργειας δεν θα ληφθεί υπόψη."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2276,8 +2372,8 @@ msgstr ""
 "προηγμένος προγραμματιζόμενος ελεγκτής διακοπών συστήματος αφορά τις "
 "διακοπές της CPU, επιλέξτε αυτήν την επιλογή αν σας ζητηθεί."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2286,8 +2382,8 @@ msgstr ""
 "ρυθμίσεις που εμφανίζονται στη γραμμή <guilabel>Επιλογές εκκίνησης</"
 "guilabel>. "
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2297,26 +2393,27 @@ msgstr ""
 "εμφανιστούν στην γραμμή <guilabel>Επιλογές εκκίνησης</guilabel>· ωστόσο, "
 "λαμβάνονται κανονικά υπόψη."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Προσθέστε περισσότερες επιλογές του πυρήνα πιέζοντας το πλήκτρο F1 (μόνο σε "
 "λειτουργία παλαιού τύπου)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2324,17 +2421,17 @@ msgstr ""
 "Επιλέξτε μια με τα βελάκια και πατήστε Enter για περισσότερες λεπτομέρειες ή "
 "πιέστε Esc για να επιστρέψετε στην οθόνη υποδοχής."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2346,23 +2443,23 @@ msgstr ""
 "στη λίστα επιλογών. Αυτές οι επιλογές μπορούν να προστεθούν και χειροκίνητα "
 "στη γραμμή <guilabel>Επιλογές εκκίνησης</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Η Βοήθεια εμφανίζεται μεταφρασμένη στην επιλεγμένη γλώσσα με το πλήκτρο F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2373,17 +2470,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Αυτή είναι η εξ ορισμού οθόνη καλωσορίσματος όταν χρησιμοποιείτε ένα CD "
 "εγκατάστασης ενσύρματου δικτύου (εικόνες Boot.iso ή Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2395,27 +2498,24 @@ msgstr ""
 "εγκατάστασης ενσύρματου δικτύου, ανατρέξτε στο <link ns2:href=\"https://wiki."
 "mageia.org/en/Boot.iso_install\">Wiki της Mageia</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Η διάταξη του πληκτρολογίου είναι η αμερικανική."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Τα βήματα εγκατάστασης"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2424,7 +2524,7 @@ msgstr ""
 "οποία μπορείτε να παρακολουθήσετε στον πλευρικό πίνακα της οθόνης."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2434,7 +2534,7 @@ msgstr ""
 "συνήθως δεν θα χρειαστεί να επιλέξετε."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2443,7 +2543,7 @@ msgstr ""
 "όπου θα βρείτε περισσότερες πληροφορίες σχετικά με το τρέχον βήμα."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2465,18 +2565,18 @@ msgstr ""
 "πατήστε <guibutton>Alt Ctrl Delete</guibutton> ταυτόχρονα για να κάνετε "
 "επανεκκίνηση."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Προβλήματα στην εγκατάσταση και πιθανές λύσεις"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Δεν λειτουργεί το γραφικό περιβάλλον"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2488,7 +2588,7 @@ msgstr ""
 "<code>vgalo</code> στην προτροπή."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2503,13 +2603,13 @@ msgstr ""
 "μια μαύρη οθόνη με τη λέξη «boot:». Πληκτρολογήστε «text» και πατήστε ENTER. "
 "Τώρα συνεχίστε την εγκατάσταση σε λειτουργία κειμένου."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Πάγωμα της εγκατάστασης"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2524,13 +2624,13 @@ msgstr ""
 "προτροπή. Αυτή η επιλογή μπορεί επίσης να συνδυαστεί με την προηγούμενη αν "
 "κριθεί απαραίτητο."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Πρόβλημα RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2543,13 +2643,13 @@ msgstr ""
 "code>, όπου xxx το σωστό μέγεθος της RAM. π.χ. <code>mem=256M</code> "
 "καθορίζει 256MB RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Δυναμικές κατατμήσεις"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4227,12 +4327,12 @@ msgstr ""
 "του μη λατινικού."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Παρακαλώ επιλέξτε τη γλώσσα που θα χρησιμοποιηθεί"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4243,7 +4343,18 @@ msgstr ""
 "για τον οδηγό εγκατάστασης και για το εγκατεστημένο σύστημα."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Επιλέξτε την γλώσσα που προτιμάτε, αναπτύσσοντας πρώτα τη λίστα της ηπείρου "
+"σας. Η <application>Mageia</application> θα χρησιμοποιήσει αυτή την επιλογή "
+"για τον οδηγό εγκατάστασης και για το εγκατεστημένο σύστημα."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4257,10 +4368,11 @@ msgstr ""
 "γλωσσών με αυτόματο τρόπο μετά την εγκατάσταση."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4270,7 +4382,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4281,7 +4393,7 @@ msgstr ""
 "σημειωθεί επίσης ως επιλεγμένη στην οθόνη πολλαπλών γλωσσών ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4291,12 +4403,12 @@ msgstr ""
 "πληκτρολογίου σας."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Η Mageia χρησιμοποιεί εξ ορισμού την υποστήριξη UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4307,7 +4419,7 @@ msgstr ""
 "UTF-8 θα εφαρμοστεί σε όλες τις γλώσσες."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4363,12 +4475,12 @@ msgstr ""
 "έξι ή περισσότερα κουμπιά."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Προσθήκη ή επεξεργασία μιας καταχώρησης στο μενού Εκκίνησης"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4378,7 +4490,7 @@ msgstr ""
 "(Διαθέσιμο στα αποθετήρια της Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5192,6 +5304,53 @@ msgstr ""
 "λίγο, είναι κανονικό."
 
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Προσαρμοσμένο"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Ασφαλές ρυθμίσεις, δίνεται προτεραιότητα στις επισφαλές επιλογές σε "
+#~ "βάρος της απόδοσης."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr ""
@@ -5653,9 +5812,6 @@ msgstr ""
 #~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
 #~ "</imageobject>"
 
-#~ msgid "Using Mageia"
-#~ msgstr "Χρήση της Mageia"
-
 #~ msgid "Using Windows"
 #~ msgstr "Χρησιμοποιώντας Windows"
 
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index 323c3a03..4c877ad2 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-07-17 11:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1258,12 +1258,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Agordi subdiskon per DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1275,7 +1275,7 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1288,7 +1288,7 @@ msgstr ""
 "ne startos."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1299,7 +1299,7 @@ msgstr ""
 "ĝi antaŭ ol komenci."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1308,7 +1308,7 @@ msgstr ""
 "USB-ŝlosilo. Ekzemple sda, sdb kaj sdc se estas tri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1317,75 +1317,80 @@ msgstr ""
 "elektita stor-aparato"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Por aliaj agoj: klaku sur la dezirata subdisko unue. Tiam vi povos vidi ĝin, "
 "elekti dosiersistemon kaj surmetingon, ŝanĝi ĝian grandon aŭ forigi ĝin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Daŭrigu ĝis kiam vi agordos ĉion laŭ via deziro."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klaku sur <guibutton>Finata</guibutton> kiam vi estos preta."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Kreo de subdiskoj"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1395,7 +1400,7 @@ msgstr ""
 "loko-proponon de DrakX por la instalo de <application>Magejo</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1404,7 +1409,7 @@ msgstr ""
 "enhavo de via konkreta(j)  stor-aparato(j)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1417,12 +1422,12 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Uzu ekzistantajn subdiskojn"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1431,12 +1436,12 @@ msgstr ""
 "kiuj povas esti utiligataj por la instalo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Uzu liberan spacon"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1445,12 +1450,12 @@ msgstr ""
 "nova Mageja instalo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Uzu la liberan spacon de vindoza subdisko"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1459,7 +1464,7 @@ msgstr ""
 "povas proponi utiligi ĝin."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1470,7 +1475,7 @@ msgstr ""
 "dosieroj antaŭe!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1487,7 +1492,7 @@ msgstr ""
 "personaj dosieroj."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1496,37 +1501,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Forviŝu kaj uzu la tutan diskon."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ĉi tiu elekto utiligos la tutan diskon por Magejo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Atentu! Ĉi tio forigos ĈIUJN datumojn en la elektita fiksita disko. Estu "
 "zorgema!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1536,12 +1541,13 @@ msgstr ""
 "disko kiujn vi ne volas perdi, ne elektu ĉi tion."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Subdiskigo"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Agordi subdiskon per DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1550,87 +1556,86 @@ msgstr ""
 "fiksita(j)  disko(j)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1640,7 +1645,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1659,17 +1664,17 @@ msgstr ""
 "settings:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Align to\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1720,7 +1725,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1732,7 +1737,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1787,7 +1792,7 @@ msgstr "Gratulon"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1798,7 +1803,7 @@ msgstr ""
 "\"exitInstall-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1808,7 +1813,7 @@ msgstr ""
 "kaj nun vi povas sekure eltiri la instal-medion kaj reŝarĝi vian komputilon."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1817,7 +1822,7 @@ msgstr ""
 "sistemon lanĉi (se vi havas pli ol unu)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1826,12 +1831,12 @@ msgstr ""
 "kaj ŝarĝita."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Ĝuu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1839,6 +1844,90 @@ msgstr ""
 "Vizitu www.mageia.org se vi havas demandojn aŭ volas kontribui al Magejo"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Strukturi subdiskojn"
@@ -1911,12 +2000,12 @@ msgstr ""
 "por daŭrigi."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, la instalilo de Magejo"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1926,7 +2015,7 @@ msgstr ""
 "estas desegnita por igi vian instaladon aŭ ĝisdatigon tiel facila kiel eble."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1934,68 +2023,77 @@ msgstr ""
 "La komenca menua ekrano havas plurajn elektojn, tamen defaŭlte lanĉiĝos la "
 "mageja instalilo, kiu kutime havos ĉion kion oni bezonas."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Bonveniga instal-ekrano"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr ""
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Uzi la lanĉilon de Magejo"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
+"\"></imagedata> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+msgid "From this screen, it is possible to set some personal preferences:"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2003,119 +2101,111 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2123,37 +2213,42 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2161,25 +2256,24 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2188,7 +2282,7 @@ msgstr ""
 "la flanka panelo de la ekrano."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2198,7 +2292,7 @@ msgstr ""
 "bezonataj elektoj."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2207,7 +2301,7 @@ msgstr ""
 "havigantan pliajn karigojn pri tiu paŝo."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2226,18 +2320,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton> samtempe.  Post tio, premu <guibutton>Alt "
 "Ctrl Delete</guibutton> samtempe por reŝarĝi."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instal-problemoj kaj eblaj solvoj"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Sen grafika interfaco"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2248,7 +2342,7 @@ msgstr ""
 "utiligi malaltan rezolucion per la tajpo de \"vgalo\" en la komand-linio."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2257,13 +2351,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Instal-paneoj"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2276,13 +2370,13 @@ msgstr ""
 "prokrastita. Por provi tion tajpu <code>noauto</code> en la komando-linio. "
 "Ĉi tiu elekto povas ankaŭ esti miksita kun la antaŭa se estas necese."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2294,13 +2388,13 @@ msgstr ""
 "la parametron mem=xxxM, kie xxx estas la ĝusta kvanto da ĉefmemoro. Ekzemple "
 "\"mem=256M\" specifus 256MB-ojn el ĉefmemoro."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3769,12 +3863,12 @@ msgstr ""
 "ekranon demandantan kiel vi ŝatus ŝanĝi inter latinaj kaj nelatinaj klavaroj"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Bv. elekti la uzotan lingvon"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3785,7 +3879,18 @@ msgstr ""
 "instalado kaj por la instalita sistemo."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Selektu vian preferatan lingvon unue per la disfaldo de via kontinenta "
+"listo. <application>Magejo</application> uzos ĉi tiun selekton dum la "
+"instalado kaj por la instalita sistemo."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3798,10 +3903,11 @@ msgstr ""
 "lingvan eltenon post la instalo."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -3811,7 +3917,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3822,7 +3928,7 @@ msgstr ""
 "plurlingva ekrano ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -3831,12 +3937,12 @@ msgstr ""
 "rekomendinde instali la lingvon de via klavaro ankaŭ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3847,7 +3953,7 @@ msgstr ""
 "sur ĉiuj instalitaj lingvoj."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3902,19 +4008,19 @@ msgstr ""
 "por konfiguri la butonojn kiuj ne funkcias en muso kun ses aŭ pli butonoj."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4589,6 +4695,20 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Subdiskigo"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr ""
@@ -4668,14 +4788,6 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
-#~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader.png\"/> </"
-#~ "imageobject>"
-#~ msgstr ""
-#~ "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align="
-#~ "\"center\"></imagedata> </imageobject>"
-
-#, fuzzy
-#~ msgid ""
 #~ "<imageobject> <imagedata xml:id=\"setupBootloader-im1\" fileref=\"live-"
 #~ "setupBootloader.png\"/> </imageobject>"
 #~ msgstr ""
diff --git a/docs/installer/es.po b/docs/installer/es.po
index d5ab2bae..8ef4086d 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-24 06:48+0000\n"
 "Last-Translator: Jose Manuel López <joselp@outlook.es>\n"
 "Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1380,12 +1380,12 @@ msgstr ""
 "selección conservadora. "
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Particionado de disco personalizado con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1396,7 +1396,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1409,7 +1409,7 @@ msgstr ""
 "lo contrario, su sistema no arrancará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1420,7 +1420,7 @@ msgstr ""
 "en ella antes de comenzar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1429,7 +1429,7 @@ msgstr ""
 "como una unidad USB. Por ejemplo, sda, sdb y sdc si se encuentran tres."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1438,27 +1438,31 @@ msgstr ""
 "del disco de almacenaje seleccionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Para cada una de las restantes acciones: haga primero click en la partición "
 "escogida. Entonces, véala, escoja un sistema de ficheros y un punto de "
 "montaje, cambie el tamaño o elimínela."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continue hasta que ajuste todo a su gusto."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Haga click en <guibutton>Hecho</guibutton> cuando esté listo."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1468,50 +1472,54 @@ msgstr ""
 "más abajo)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Si está instalando Mageia en un sistema Legacy/GPT, compruebe que existe una "
 "partición BIOS de arranque de tipo correcto"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Particionando"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1522,7 +1530,7 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1531,7 +1539,7 @@ msgstr ""
 "contenido de su(s) disco(s)  duro(s)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1544,12 +1552,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Usar la partición existente"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1558,12 +1566,12 @@ msgstr ""
 "compatibles con Linux que pueden ser usadas para la instalación."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Usar el espacio libre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1572,12 +1580,12 @@ msgstr ""
 "nueva instalación de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Usar espacio libre en una partición de Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1586,7 +1594,7 @@ msgstr ""
 "puede ofrecer usarlo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1597,7 +1605,7 @@ msgstr ""
 "de seguridad de todos sus archivos importantes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1615,7 +1623,7 @@ msgstr ""
 "de sus archivos personales."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1629,12 +1637,13 @@ msgstr ""
 "imagen siguiente."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1642,24 +1651,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Borrar y usar el disco entero"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Esta opción usará el disco completo para Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "¡Aviso! Esto borrara TODA la información en el disco duro seleccionado. "
 "¡Tenga cuidado!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1669,12 +1678,13 @@ msgstr ""
 "en la unidad que no quiere perder, no use esta opción."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Particionamiento  personalizado"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Particionado de disco personalizado con DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1683,12 +1693,13 @@ msgstr ""
 "en su(s)  disco(s) duro(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Tamaño de las particiones:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1697,7 +1708,7 @@ msgstr ""
 "reglas:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1706,7 +1717,7 @@ msgstr ""
 "partición para /, y no hay una partición separada para /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1714,23 +1725,23 @@ msgstr ""
 "particiones"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr "6/19 del espacio total disponible se asigna a / con un máximo de 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 se asigna a swap con un máximo de 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "el resto (por lo menos 12/19) se asigna a /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1739,12 +1750,13 @@ msgstr ""
 "creará tres particiones: 50 GB para /, 4 GB para swap y el resto para /home"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Si está usando un sistema UEFI, el ESP (Partición del Sistema EFI, en "
 "español) se detectará automáticamente, o creará si aún no existe en /boot/"
@@ -1752,13 +1764,14 @@ msgstr ""
 "hizo correctamente."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Si está usando un sistema Legacy (conocido como CSM o BIOS) con un disco "
 "GPT, necesita creat una partición de arranque BIOS, en caso de que no "
@@ -1768,12 +1781,12 @@ msgstr ""
 "de arranque BIOS como sistema de archivos."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1781,7 +1794,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1790,7 +1803,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1809,17 +1822,17 @@ msgstr ""
 "siguientes configuraciones:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Alinear a\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Espacio libre que precede a (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1854,7 +1867,8 @@ msgstr "Documentación Oficial para Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1870,7 +1884,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1882,7 +1896,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1937,7 +1951,7 @@ msgstr "Felicitaciones"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1946,7 +1960,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1956,7 +1970,7 @@ msgstr ""
 "ahora es seguro retirar el medio de instalación y reiniciar su ordenador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1965,7 +1979,7 @@ msgstr ""
 "sistemas operativos de su ordenador (si tiene más de uno)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1974,12 +1988,12 @@ msgstr ""
 "Mageia será automáticamente seleccionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "¡Que lo disfrute!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1987,6 +2001,92 @@ msgstr ""
 "Visite www.mageia.org si tiene alguna duda o quiere contribuir con Mageia."
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Tamaño de las particiones:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Genérico</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formateo"
@@ -2061,12 +2161,12 @@ msgstr ""
 "guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, el instalador de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2077,7 +2177,7 @@ msgstr ""
 "posible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2085,54 +2185,59 @@ msgstr ""
 "El menú inicial tiene varias opciones, aunque la elegida por defecto "
 "iniciará el instalador, que normalmente será todo lo que necesite."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Pantalla de bienvenida del Instalador"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Usando el cargador de arranque de Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Aquí están las pantallas de bienvenida por defecto cuando se utiliza un DVD "
 "Mageia, la primera con un sistema sistema heredado y la segunda con un "
 "sistema UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Desde esta primera pantalla, es posible configurar algunas preferencias "
 "personales:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2140,23 +2245,23 @@ msgstr ""
 "El idioma (para la instalación solamente, puede ser diferente al lenguaje "
 "elegido para el sistema) pulsando la tecla F2 (modo heredado solamente)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Use las teclas de flechas para elegir el idioma y pulse la tecla Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2168,33 +2273,32 @@ msgstr ""
 "<guilabel>Sistema de recuperacion</guilabel>, <guilabel>Prueba de Memoria</"
 "guilabel> ni <guilabel>Herramienta de deteccion de Hardware</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Cambie la resolución de pantalla pulsando la tecla F3 (modo heredado "
 "solamente)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2203,8 +2307,8 @@ msgstr ""
 "Añadir algunas opciones del núcle presionando \"F6\"  para el modo heredado, "
 "o \"e\" para el modo UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2215,22 +2319,13 @@ msgstr ""
 "muestra la nueva línea <guilabel>Opciones de arranque</guilabel> y propone "
 "cuatro opciones:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Por defecto, no cambia nada en las opciones por defecto."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Configuración segura, se da prioridad a las opciones más seguras en "
-"detrimento del rendimiento."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2238,8 +2333,8 @@ msgstr ""
 "- Sin ACPI (Advanced Configuration and Power Interface), la administración "
 "de energía no se tiene en cuenta."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2247,8 +2342,8 @@ msgstr ""
 "- Sin Local APIC (Local Advanced Programmable Interrupt Controller), se "
 "refiere a las interrupciones de la CPU. Seleccione esta opción si se le pide."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2256,8 +2351,8 @@ msgstr ""
 "Cuando seleccione una de estas entradas, se modifica las opciones por "
 "defecto mostradas en la línea <guilabel>Opciones de Arranque</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2267,24 +2362,25 @@ msgstr ""
 "con la tecla F6 no aparezcan en la línea <guilabel>Opciones de Arranque</"
 "guilabel>. Sin embargo, sí se tienen en cuenta."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr "Añadir más opciones de kernel pulsando la tecla F1 (sólo modo Legacy)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2292,17 +2388,17 @@ msgstr ""
 "Seleccione una con las teclas de flechas y pulse Enter para más detalles, o "
 "pulse la tecla Esc para volver a la ventana anterior."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2314,23 +2410,23 @@ msgstr ""
 "lista de opciones. Estas opciones pueden ser añadidas a mano en la linea de "
 "<guilabel>Opciones de Arranque</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Esta ayuda se encuentra traducida en el idioma de su elección con la tecla F2"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2341,18 +2437,24 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Aqui se encuentra la pantalla de bienvenida por defecto cuando se utiliza un "
 "CD de instalacion basada en Red Alambrica (imagenes Boot.iso o Boot-Nonfree."
 "iso)"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2364,27 +2466,24 @@ msgstr ""
 "instalación basada en Red Alámbrica, visite <link ns2:href=\"https://wiki."
 "mageia.org/en/Boot.iso_install\">el Wiki de Mageia</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "La distribución del teclado es la de un teclado Americano"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Los pasos de la instalación"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2393,7 +2492,7 @@ msgstr ""
 "seguidos en el panel lateral de la pantalla."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2402,7 +2501,7 @@ msgstr ""
 "<guibutton>Avanzados</guibutton> con opciones extra, normalmente poco usadas."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2411,7 +2510,7 @@ msgstr ""
 "que le darán explicaciones sobre el paso en cuestión."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2430,18 +2529,18 @@ msgstr ""
 "pulsando al mismo tiempo <guibutton>Alt Ctrl F2</guibutton>. Después, pulse "
 "<guibutton>Alt Ctrl Delete</guibutton> simultáneamente para reiniciar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas en la Instalación y Posibles Soluciones."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "No hay Interfaz Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2453,7 +2552,7 @@ msgstr ""
 "code> en la terminal."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2468,13 +2567,13 @@ msgstr ""
 "palabra \"boot\". Escriba \"text\" y presione ENTER. Ahora continúe con la "
 "instalación en modo texto."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "La Instalación se congela"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2488,13 +2587,13 @@ msgstr ""
 "escriba <code>noauto</code> en la terminal.  Esta opción puede ser combinada "
 "con otras si es necesario."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problema de RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2507,13 +2606,13 @@ msgstr ""
 "cantidad correcta de RAM, por ejemplo: <code>mem=256M</code> significaría "
 "256MB de RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Particiones dinámicas"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4152,12 +4251,12 @@ msgstr ""
 "y no latinas."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Por favor elija un idioma"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4168,7 +4267,18 @@ msgstr ""
 "instalación y para su sistema instalado."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Elija su idioma preferido extendiendo la lista de su continente.  "
+"<application>Mageia</application> usará esta selección durante la "
+"instalación y para su sistema instalado."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4181,10 +4291,11 @@ msgstr ""
 "instalación."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4194,7 +4305,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4205,7 +4316,7 @@ msgstr ""
 "de múltiples idiomas."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4214,12 +4325,12 @@ msgstr ""
 "también el idioma de su teclado."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia usa soporte UTF-8 (Unicode) por defecto."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4230,7 +4341,7 @@ msgstr ""
 "idiomas instalados."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4284,12 +4395,12 @@ msgstr ""
 "más botones."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Agregando o modificando una entrada en el menú de arranque"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4298,7 +4409,7 @@ msgstr ""
 "software grub-customizer (Disponible en los repositorios Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5098,3 +5209,50 @@ msgstr ""
 "El siguiente paso es copiar los archivos al disco rígido. Esto toma algunos "
 "minutos. Al final se obtiene una pantalla en blanco durante algún tiempo. Es "
 "normal."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Particionamiento  personalizado"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Configuración segura, se da prioridad a las opciones más seguras en "
+#~ "detrimento del rendimiento."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/et.po b/docs/installer/et.po
index 6b73fb64..92a99725 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-25 09:51+0000\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1350,12 +1350,12 @@ msgstr ""
 "tasub valides olla pigem konservatiivne."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1366,7 +1366,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1379,7 +1379,7 @@ msgstr ""
 "ole süsteemi võimalik üldse laadida."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1390,7 +1390,7 @@ msgstr ""
 "alustamist näha, mida partitsioon sisaldab."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1400,7 +1400,7 @@ msgstr ""
 "olema kolm salvestusseadet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1409,27 +1409,31 @@ msgstr ""
 "<guibutton>Kustuta kõik</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Kõigi teiste toimingute jaoks klõpsake kõigepealt vajalikul partitsioonil. "
 "Siis saate seda uurida, valida failisüsteemi või haakepunkti, suurust muuta "
 "või ka kustutada."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Jätkake, kuni kõik on nii, nagu soovite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kui kõik on valmis, klõpsake nupule <guibutton>Tehtud</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1439,50 +1443,54 @@ msgstr ""
 "tagapool)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Kui paigaldate Mageia pärand/GPT süsteemi, kontrollige, kas korrektse "
 "tüübiga BIOS-e alglaadimispartitsioon on ikka olemas."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partitsioneerimine"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1493,7 +1501,7 @@ msgstr ""
 "paigaldamiseks."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1502,7 +1510,7 @@ msgstr ""
 "sisust."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1515,12 +1523,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Olemasolevate partitsioonide kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1529,12 +1537,12 @@ msgstr ""
 "neid võib kasutada paigaldamiseks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Vaba ruumi kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1543,12 +1551,12 @@ msgstr ""
 "uuele Mageia paigaldusele."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Vaba ruumi kasutamine Windowsi partitsioonil"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1557,7 +1565,7 @@ msgstr ""
 "paigaldusprogramm seda kasutada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1568,7 +1576,7 @@ msgstr ""
 "kõigist olulistest failidest varukoopia!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1585,7 +1593,7 @@ msgstr ""
 "äärmiselt soovitatav kõik vähegi olulised failid eelnevalt varundada."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1599,12 +1607,13 @@ msgstr ""
 "Seda näitab allolev pilt."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1612,24 +1621,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Kogu ketta tühjendamine ja kasutamine"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Selle valimisel kasutatakse kogu ketast ainult Mageia jaoks."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Tähelepanu! Sellega kustutatakse valitud kõvakettalt KÕIK andmed. Olge "
 "ettevaatlik!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1639,12 +1648,13 @@ msgstr ""
 "kettal andmeid, mida te ei soovi kaotada, ärge seda võimalust valige."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Ketta jagamine oma tahtmist mööda"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Ketta kohandatud partitsioneerimine DiskDrake'i abil"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1653,12 +1663,13 @@ msgstr ""
 "või -ketastel paigaldatakse."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitsioonide suurus:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1666,7 +1677,7 @@ msgstr ""
 "Paigaldusprogramm jagab saadaoleva ruumi ära järgmiste reeglite kohaselt:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1675,30 +1686,30 @@ msgstr ""
 "ning /home jaoks eraldi partitsiooni ei looda."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr "Kui kokku on saadaval üle 50 GB, luuakse kolm partitsiooni"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 saadaolevast koguruumist eraldatakse / jaoks maksimaalse suurusega 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 eraldatakse saalealaks maksimaalse suurusega 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "ülejäänu (vähemalt 12/19) eraldatakse /home jaoks"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1707,12 +1718,13 @@ msgstr ""
 "partitsiooni: 50 GB / jaoks, 4 GB saaleala jaoks ja ülejäänu /home jaoks."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Kui kasutate UEFI süsteemi, tuvastatakse automaatselt ESP (EFI süsteemne "
 "partitsioon) või see luuakse, kui seda pole, ja haagitakse asukohas /boot/"
@@ -1720,13 +1732,14 @@ msgstr ""
 "õigesti tehtud."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Kui kasutate pärandsüsteemi (tuntud ka kui CSM või BIOS) GPT-kettaga, tuleb "
 "luua BIOS-e alglaadimispartitsioon, kui seda veel ei ole. See on umbes 1 MiB "
@@ -1735,12 +1748,12 @@ msgstr ""
 "ainult et valige failisüsteemiks BIOS boot partition."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1748,7 +1761,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1757,7 +1770,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1776,17 +1789,17 @@ msgstr ""
 "gparted."
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Align to\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1821,7 +1834,8 @@ msgstr "Mageia ametlik dokumentatsioon"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1837,7 +1851,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1849,7 +1863,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1906,7 +1920,7 @@ msgstr "Õnnitleme!"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1915,7 +1929,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1926,7 +1940,7 @@ msgstr ""
 "taaskäivitada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1935,7 +1949,7 @@ msgstr ""
 "operatsioonisüsteemi, kui teil peaks neid arvutis üle ühe olema."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1944,12 +1958,12 @@ msgstr ""
 "automaatselt teie uus Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Tundke rõõmu ja nautige!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1958,6 +1972,92 @@ msgstr ""
 "anda oma panuse Mageia edusse."
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitsioonide suurus:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Tavaline</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Vormindamine"
@@ -2031,12 +2131,12 @@ msgstr ""
 "guibutton>."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "Mageia paigaldusprogramm DrakX"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2047,7 +2147,7 @@ msgstr ""
 "uuendamine oleks kõigile võimalikult lihtne."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2055,51 +2155,56 @@ msgstr ""
 "Avamenüüs näete mitmeid valikuid, kuid vaikimisi valitu käivitab "
 "paigaldusprogrammi, mida tavaliselt ongi vaja."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Paigaldusprogrammi avaekraan"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Mageia alglaaduri kasutamine"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Siin on näha Mageia DVD vaikimisi tervitusekraanid: esimest näeb tavapärase "
 "süsteemi, teist UEFI süsteemi korral."
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "Avaekraanil on võimalik määrata mõned isiklikud eelistused:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2107,22 +2212,22 @@ msgstr ""
 "Keel (ainult paigaldamiseks, võib erineda süsteemile valitavast keelest) "
 "klahvile F2 vajutades (ainult tavapärases süsteemis)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Valige nooleklahvidega liikudes keel ja vajutage klahvile Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2134,32 +2239,31 @@ msgstr ""
 "<guilabel>Mälu testimine</guilabel> ja <guilabel>Riistvara tuvastamise "
 "tööriist</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Muuta ekraanilahutust klahvile F3 vajutades (ainult tavapärases süsteemis)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2169,8 +2273,8 @@ msgstr ""
 "\">F6</emphasis> tavapärase süsteemi ja klahvile <emphasis role=\"bold\">e</"
 "emphasis> UEFI süsteemi korral."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2180,27 +2284,20 @@ msgstr ""
 "kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale tekstirea "
 "<guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Vaikimisi, mille korral vaikimisi võtmeid ei muudeta."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr "- Ohutud sätted, mille korral jõudlusele eelistatakse ohutust."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr "- Ilma ACPI-ta, mille korral toitehalduse valikuid ei arvestata."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2208,8 +2305,8 @@ msgstr ""
 "- Ilma kohaliku APIC-ta, mis puudutab CPU katkestusi. Valige see siis, kui "
 "seda nõutakse."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2217,8 +2314,8 @@ msgstr ""
 "Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida näeb real "
 "<guilabel>Alglaadimise sätted</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2228,26 +2325,27 @@ msgstr ""
 "näe real <guilabel>Alglaadimise sätted</guilabel>, aga neid siiski "
 "arvestatakse."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Lisada veel rohkem kerneli võtmeid klahvile F1 vajutades (ainult tavapärases "
 "süsteemis)"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2255,17 +2353,17 @@ msgstr ""
 "vajalik ja vajutage klahvile Enter üksikasjade nägemiseks või klahvile Esc "
 "tervitusekraani juurde naasmiseks."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2277,22 +2375,22 @@ msgstr ""
 "guilabel>, et minna tagasi võtmete loendisse. Võtmeid saab lisada käsitsi "
 "reale <guilabel>Alglaadimise sätted</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Abi tõlgitakse keelde, mis on valitud klahviga F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2303,17 +2401,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse CD "
 "(Boot.iso või Boot-Nonfree.iso tõmmis) kasutamisel:"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2325,27 +2429,24 @@ msgstr ""
 "<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia "
 "Wikist</link>."
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Klaviatuuripaigutus on Ameerika-pärane."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Paigaldamise etapid"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2354,7 +2455,7 @@ msgstr ""
 "külgpaneelil."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2364,7 +2465,7 @@ msgstr ""
 "vajalikud valikud."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2373,7 +2474,7 @@ msgstr ""
 "etappi põhjalikumalt."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2393,18 +2494,18 @@ msgstr ""
 "guibutton>. Seejärel vajutage taaskäivitamiseks korraga klahve "
 "<guibutton>Alt Ctrl Delete</guibutton>."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Paigaldamisprobleemid ja nende võimalikud lahendused"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Graafiline liides puudub"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2415,7 +2516,7 @@ msgstr ""
 "ekraanilahutust, kirjutades käsureale <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2429,13 +2530,13 @@ msgstr ""
 "vajutamisega. Teie ette ilmub must ekraan sõnaga \"boot:\".  Kirjutage \"text"
 "\" ja vajutage ENTER. Nüüd saate jätkata tekstipõhise paigaldamisega."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Paigaldamine hangub"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2449,13 +2550,13 @@ msgstr ""
 "<code>noauto</code>. Vajaduse korral võib seda võtit kasutada koos teiste "
 "võtmetega."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM-i probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2467,13 +2568,13 @@ msgstr ""
 "parameetrit <code>mem=xxxM</code>, kus xxx on korrektne mälu suurus. Näiteks "
 "<code>mem=256M</code> määrab, et kasutada on 256 MB mälu."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dünaamilised partitsioonid"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4097,12 +4198,12 @@ msgstr ""
 "klaviatuuripaigutuste vahel."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Kasutatava keele valimine"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4113,7 +4214,18 @@ msgstr ""
 "paigaldamise ajal kui ka paigaldatud süsteemis."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Valige vajalik keel, laiendades nimekirja kõigepealt maailmajao järgi.  "
+"<application>Mageia</application> kasutab langetatud valikut nii "
+"paigaldamise ajal kui ka paigaldatud süsteemis."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4126,10 +4238,11 @@ msgstr ""
 "keelte lisamine juba palju keerulisem."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4139,7 +4252,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4149,7 +4262,7 @@ msgstr ""
 "eelistatud keeleks. See keel on märgitud ka mitme keele valimise ekraanil."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4158,12 +4271,12 @@ msgstr ""
 "paigaldada kohe ka klaviatuurile vastav keel."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia toetab vaikimisi UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4174,7 +4287,7 @@ msgstr ""
 "paigaldatavatele keeltele."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4226,12 +4339,12 @@ msgstr ""
 "et seadistada nuppe, mis peaksid töötama kuue või rohkema nupuga hiirel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Alglaadimismenüü kirje lisamine või muutmine"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4240,7 +4353,7 @@ msgstr ""
 "rakendust grub-customizer (selle leiab Mageia tarkvarahoidlast)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5034,3 +5147,48 @@ msgstr ""
 "Järgmisel sammul kopeeritakse failid kõvakettale. See võtab mõne minuti "
 "aega. Lõpus näeb mõnda aega tühja ekraani, millest ei tasu end heidutada "
 "lasta."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Ketta jagamine oma tahtmist mööda"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr "- Ohutud sätted, mille korral jõudlusele eelistatakse ohutust."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index 426aefa2..22b2e0e3 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-07 12:11+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1357,12 +1357,12 @@ msgstr ""
 "kontserbadorea izan behar da."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Pertsonalizatua disko partizioak DiskDrake-rekin"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1373,7 +1373,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1386,7 +1386,7 @@ msgstr ""
 "sistema ez izango da abiarazi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1397,7 +1397,7 @@ msgstr ""
 "haietan hasi baino lehen dagoena arren ikusi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1407,7 +1407,7 @@ msgstr ""
 "badira."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1416,74 +1416,81 @@ msgstr ""
 "partizio guztiak garbitzeko"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Beste ekintza guztiak: sakatu nahi den partizioa lehenik. Gero ikusi, edo "
 "aukeratu fitxategi sistema eta muntatze puntua, tamainaz aldatu edo garbitu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Jarraitu dena zure nahiei egokitu arte."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik <guibutton>Eginda</guibutton> prest zaudenean."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partizioa egiten"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1494,7 +1501,7 @@ msgstr ""
 "duen tokia ikusi."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1503,7 +1510,7 @@ msgstr ""
 "disko gogor(rren) diseinu eta edukien arabera."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1516,12 +1523,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Lehendik dauden Partizioak"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1530,12 +1537,12 @@ msgstr ""
 "egin dira eta instalazioa erabili ahal izango du."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Erabili Espazio Hutsa"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1544,12 +1551,12 @@ msgstr ""
 "erabiliko da zure Mageia instalazio berriarentzat."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Erabili Espazio Librea Windows-en Partizioan"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1558,7 +1565,7 @@ msgstr ""
 "instalatzaileak, erabili ahal izateko eskainiko dizu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1569,7 +1576,7 @@ msgstr ""
 "garrantzitsuen babeskopia egin behar duzu!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1586,7 +1593,7 @@ msgstr ""
 "gomendagarria da zure fitxategi pertsonalaren babeskopia bat egitea."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1599,12 +1606,13 @@ msgstr ""
 "partizioen arteko hutsunea arrastatuz. Ikusi beheko pantaila."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1612,24 +1620,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Ezabatu eta erabili disko osoa."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Aukera honek disko osoa erabiliko du Mageia-rantzat."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Oharra! Aukeratutako disko gogorraren datu guztiak ezabatuko dira. Kontuz "
 "ibili!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1639,12 +1647,13 @@ msgstr ""
 "informazioa baduzu,, ez ezazu aukera hau erabili."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Pertsonalizatua"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Pertsonalizatua disko partizioak DiskDrake-rekin"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1653,12 +1662,13 @@ msgstr ""
 "gogorrean."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partizioak dimentsionatzen:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1667,7 +1677,7 @@ msgstr ""
 "arabera:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1676,7 +1686,7 @@ msgstr ""
 "ez da sortuko /, ez baitago /home partizioa bereizita ."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1684,24 +1694,24 @@ msgstr ""
 "partizio sortuko dira"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 erabateko espazio libretik /-ra esleitzen da 50 GB-ko gehiengoarekin"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 4 GB gehienez trukatzeko esleitzen da"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "gainerakoa (gutxienez 12/19) da / home-ra esleitzen da"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1711,12 +1721,13 @@ msgstr ""
 "home-entzako."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "UEFI sistema bat erabiltzen ari bazara, ESP (EFI sistema partizioa) "
 "automatikoki detektatu egingo da, edo sortu ez bada existitzen oraindik, "
@@ -1724,22 +1735,22 @@ msgstr ""
 "frogatzen du."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1747,7 +1758,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1756,7 +1767,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1774,17 +1785,17 @@ msgstr ""
 "gero, eta hurrengo konfigurazioak erabil ditzala:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"lerrokatu\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Aurreko espazio librea (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "Ziurtatzen partizio guztiak sortzen diturela megabyte kopuru batekin."
@@ -1817,7 +1828,8 @@ msgstr "Mageia-ren dokumentazio Ofiziala"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1833,7 +1845,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1845,7 +1857,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1901,7 +1913,7 @@ msgstr "Zorionak"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1910,7 +1922,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1921,7 +1933,7 @@ msgstr ""
 "berrabiaraztea."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1930,7 +1942,7 @@ msgstr ""
 "eragileen artean aukera dezakezu (bat baino gehiago izanez gero)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1939,12 +1951,12 @@ msgstr ""
 "automatikoki hautatu eta hasiko da."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Gozatu!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1953,6 +1965,92 @@ msgstr ""
 "izanez"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Partizioak dimentsionatzen:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generikoa</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formateatzen"
@@ -2026,12 +2124,12 @@ msgstr ""
 "klikatu jarraitzeko."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Instalatzilea"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2042,7 +2140,7 @@ msgstr ""
 "bezain erraz egiten laguntzeko."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2050,52 +2148,57 @@ msgstr ""
 "Hasierako menuak hainbat aukera ditu, baina aukera lehenetsia instalatzailea "
 "da, normalean, behar duzun guztia dela."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Instalazio Ongi etorri Pantaila"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Mageia abio kargatzailea erabiliz"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Hemen lehenetsitako ongietorri pantaila, Lehenean ondare sistema eta "
 "bigarrenean UEFI sistema bat duen Mageia DVD bat erabiliz:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Lehenengo pantaila honetan, posible da lehentasun pertsonal batzuk ezartzea:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2103,22 +2206,22 @@ msgstr ""
 "Hizkuntza (instalaziorako soilik, sisteman aukeratutako hizkuntzaren "
 "desberdinak izan daitezke) F2 gakoa sakatuz (Ondare moduan soilik)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Erabili geziak hizkuntza aukeratzeko eta sakatu Sartu."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2131,31 +2234,30 @@ msgstr ""
 "<guilabel>Memoriaren Frogapena</guilabel> ezta <guilabel>Hardwarea "
 "antzemateko tresnarik</guilabel> ere."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "Aldatu pantailaren bereizmena F3 tekla (Ondare moduan soilik) sakatuz."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2164,8 +2266,8 @@ msgstr ""
 "Gehitu kernel aukera batzuk <emphasis role=\"bold\">F6</emphasis> ondare "
 "moduan edo <emphasis role=\"bold\">e</emphasis> sakatuz  UEFI modurako."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2176,22 +2278,13 @@ msgstr ""
 "den menuak lerro <guilabel>Abio aukarak</guilabel> berri bat erakusten du "
 "eta lau aukera proposatzen ditu:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Berez, ez du lehenetsitako aukeretan ezer aldatzen."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Ezarpenak Seguruak, lehentasuna ematen da aukera seguruei prozeduraren "
-"kalterako."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2199,8 +2292,8 @@ msgstr ""
 "- ACPI-rik gabe (Advanced Configuration and Power Interface), energia-"
 "administrazioa ez da kontuan hartzen."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2208,8 +2301,8 @@ msgstr ""
 "- APIC-a Lokalik (Local Advanced Programmable Interrupt Controller) gabe, "
 "CPU-aren etenez dihardu. Aukera hau aukeratu ezazu eskatzen bazaizu."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2217,8 +2310,8 @@ msgstr ""
 "Sarrera horietako bat hautatzean, <guilabel>Abio aukera</guilabel> lerroan "
 "erakutsitako jatorrizko aukerak aldatzen dira."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2228,24 +2321,25 @@ msgstr ""
 "direla <guilabel>Abio aukerak</guilabel> lerroan agertzen gerta daiteke. "
 "Hala ere, kontuan izango dira."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr "Gehitu kernel aukera gehiago F1 tekla (Ondare moduan soilik) sakatuz."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2253,17 +2347,17 @@ msgstr ""
 "teklekin eta ENTER-a saka ezazu xehetasun gehiago izateko edo Esc tekla saka "
 "ezazu ongietorri-pantailara itzultzeko."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2275,22 +2369,22 @@ msgstr ""
 "itzultzeko. Aukera hauek eskuz gehitu daitezke <guilabel>Abioko Aukera</"
 "guilabel> lerroan."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Laguntzak F2 teklaz aukeratutako hizkuntza emaitza du."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2301,17 +2395,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Hona hemen hasierako pantaila kable sare instalazioan oinarritzen CD bat "
 "erabiltzen denean (Boot.iso edo Boot-Nonfree.iso imajinak)"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2323,27 +2423,24 @@ msgstr ""
 "lortzeko, bisitatu <link ns2:href=\"https://wiki.mageia.org/en/Boot."
 "iso_install\">Mageiaren Wiki-a</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Teklatuaren diseinua amerikarra da."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Instalazio urratsak"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2352,7 +2449,7 @@ msgstr ""
 "daitezke."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2362,7 +2459,7 @@ msgstr ""
 "erabiltzen dira ."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2371,7 +2468,7 @@ msgstr ""
 "pausuei buruzko azalpenak emango dizute."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2390,18 +2487,18 @@ msgstr ""
 "terminalera sar zaitez <guilabel>Alt Ctrl F2</guilabel> aldi berean sakatuz. "
 "Gero, <guilabel>Alt Ctrl Delete</guilabel> saka ezazu aldi berean berrasteko."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Instalazio arazoak eta Konponbide Posibleak"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Interfaze Grafikorik gabe"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2413,7 +2510,7 @@ msgstr ""
 "terminalean idatziz."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2428,13 +2525,13 @@ msgstr ""
 "\"text\" idatz ezazu eta ENTER sakatu ezazu. Orain testu moduko "
 "instalazioarekin jarrai ezazu."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Instalatu Osagaiak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2448,13 +2545,13 @@ msgstr ""
 "<code>noauto</code> idatz ezazu terminalean. Beharrezkoa bada aukera hau "
 "beste batzuekin konbina daiteke."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM arazoak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2467,13 +2564,13 @@ msgstr ""
 "zuzena den, adibidez: <code>mem=256M</code>-ak RAM 256MB esan nahi izango "
 "lituzke."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Partizio dinamikoak"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4065,12 +4162,12 @@ msgstr ""
 "xedapen artean aldatzeko."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Aukeratu erabiltzeko hizkuntza bat"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4081,7 +4178,18 @@ msgstr ""
 "zehar eta instalatutako sisteman."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Zure hizkuntza gogokoena aukeratu zure kontinenteko zerrenda luzatzen. "
+"<application>Mageia</application> aukeraketa hori erabiliko da instalazioan "
+"zehar eta instalatutako sisteman."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4094,10 +4202,11 @@ msgstr ""
 "izan daiteke."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4107,7 +4216,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4118,7 +4227,7 @@ msgstr ""
 "hizkuntzatako aukera pantailan markatuta egongo da."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4127,12 +4236,12 @@ msgstr ""
 "komeni da, zure teklatuaren hizkuntza instalatzea."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia UTF-8 (Unicode) laguntza erabiltzen du lehenespenez."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4143,7 +4252,7 @@ msgstr ""
 "eskuragarri egongo instalatutako inongo hizkuntzatarako."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4198,19 +4307,19 @@ msgstr ""
 "konfiguratzen."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Gegitu edo Aldatu Abio Menuko Sarrera"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4936,3 +5045,50 @@ msgstr ""
 "Hurrengo pausoa disko gogorrean fitxategiak kopiatzea da. Honek minutu "
 "batzuk hartzen ditu. Bukaeran, pantaila huts bat daukazu aldi baterako, "
 "normala da."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Pertsonalizatua"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Ezarpenak Seguruak, lehentasuna ematen da aukera seguruei prozeduraren "
+#~ "kalterako."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 1dbcc457..a6067e60 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-26 09:33+0000\n"
 "Last-Translator: Lebarhon <lebarhon@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1396,12 +1396,12 @@ msgstr ""
 "prudent dans vos choix."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partitionnement personnalisé du disque avec DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1412,7 +1412,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1425,7 +1425,7 @@ msgstr ""
 "système ne pourra pas s'amorcer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1437,7 +1437,7 @@ msgstr ""
 "modifications."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1447,7 +1447,7 @@ msgstr ""
 "s'ils sont trois."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1456,27 +1456,31 @@ msgstr ""
 "supprimer toutes les partitions du périphérique de stockage sélectionné."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Pour toutes les autres actions : Cliquer d'abord sur la partition concernée. "
 "Ensuite, l'observer, choisir un système de fichiers et un point de montage, "
 "la redimensionner ou la supprimer."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continuer jusqu'à ce que tout soit conforme aux désirs."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Cliquer sur <guibutton>Terminer</guibutton> quand tout est correct.."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1486,51 +1490,55 @@ msgstr ""
 "montée sur /boot/EFI (voir ci-dessous) "
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Si vous installez Mageia sur un système Legacy/GPT, vérifiez qu'une "
 "partition d'amorçage en mode BIOS (BIOS boot partition) est présente et "
 "posséde le type requis."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partitionnement"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1541,7 +1549,7 @@ msgstr ""
 "installer <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1550,7 +1558,7 @@ msgstr ""
 "contenu et de l'agencement de chaque disque dur en particulier."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1563,12 +1571,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Utiliser les partitions existantes"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1577,12 +1585,12 @@ msgstr ""
 "ont été trouvées et sont utilisables pour l'installation de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Utiliser l'espace libre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1591,12 +1599,12 @@ msgstr ""
 "l'utilisera pour l'installation de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Utiliser l'espace libre sur une partition Microsoft Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1605,7 +1613,7 @@ msgstr ""
 "l'installateur propose de l'utiliser."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1616,7 +1624,7 @@ msgstr ""
 "assurer de posséder une sauvegarde de tous les fichiers importants."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1634,7 +1642,7 @@ msgstr ""
 "préalable."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1648,12 +1656,13 @@ msgstr ""
 "capture d'écran ci-dessous."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1661,24 +1670,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Effacer et utiliser le disque tout entier"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Cette option utilise le disque complet pour Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Attention ! Cela effacera TOUTES les données sur le disque sélectionné. "
 "Faites attention !"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1689,12 +1698,13 @@ msgstr ""
 "perdues, alors ne pas utiliser cette option."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Partitionnement de disque personnalisé"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Partitionnement personnalisé du disque avec DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1703,12 +1713,13 @@ msgstr ""
 "installation sur le(s)  disque(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionnement des partitions :</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1716,7 +1727,7 @@ msgstr ""
 "L'installeur partagera l'espace disponible selon les règles suivantes :"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1726,7 +1737,7 @@ msgstr ""
 "home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1734,7 +1745,7 @@ msgstr ""
 "sont créées. "
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1742,18 +1753,18 @@ msgstr ""
 "répertoires /, jusqu'à un maximum de 50 Go."
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19ème est alloué au SWAP avec un maximum de 4 Go."
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 "Le reste (à minima 12/19ème) est alloué au répertoire utilisateur /home."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1763,12 +1774,13 @@ msgstr ""
 "home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Si vous utilisez un système UEFI, l'ESP (partition système EFI) sera "
 "détectée automatiquement, ou créée si elle n'existe pas encore, et montée "
@@ -1776,13 +1788,14 @@ msgstr ""
 "vérifier si l'opération a été effectuée correctement "
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Si vous utilisez un système en mode Legacy (parfois nommé CSM ou BIOS) avec "
 "un disque GPT, vous devez créer une partition d'amorçage BIOS (Bios boot "
@@ -1793,12 +1806,12 @@ msgstr ""
 "comme type de système de fichiers."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1806,7 +1819,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1815,7 +1828,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1835,17 +1848,17 @@ msgstr ""
 "suivante :"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Align to\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Free space preceding (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1880,7 +1893,8 @@ msgstr "La documentation officielle de Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1896,7 +1910,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1908,7 +1922,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1964,7 +1978,7 @@ msgstr "Félicitations"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1973,7 +1987,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1984,7 +1998,7 @@ msgstr ""
 "et de redémarrer l'ordinateur."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1994,7 +2008,7 @@ msgstr ""
 "l'écran du chargeur de démarrage ."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2003,12 +2017,12 @@ msgstr ""
 "l'installation de Mageia sera automatiquement sélectionnée et démarrée."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Prenez plaisir !"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2017,6 +2031,92 @@ msgstr ""
 "Mageia."
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionnement des partitions :</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Générique</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatage"
@@ -2093,12 +2193,12 @@ msgstr ""
 "<guibutton>Suivant</guibutton> pour continuer."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'installateur de Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2109,7 +2209,7 @@ msgstr ""
 "mise à jour aussi aisée que possible."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2118,54 +2218,59 @@ msgstr ""
 "défaut démarre l'installation, ce qui correspondra à ce qui est souhaité la "
 "plupart du temps ."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Ecran d'accueil de l'installation"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Utiliser un chargeur de démarrage Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Voici les écrans d'accueil par défaut lors de l'utilisation du DVD Mageia, "
 "le premier pour un système avec le mode Legacy, le second pour un système "
 "avec UEFI :"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "A partir de ce premier écran, il est possible de paramétrer des préférences "
 "personnelles :"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2174,24 +2279,24 @@ msgstr ""
 "uniquement). Il s'agit seulement de la langue pour l'installation (elle peut "
 "être différente de la langue sélectionnée pour le système)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Utilisez les touches fléchées pour sélectionner la langue puis presser sur "
 "la touche Entrée."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2203,33 +2308,32 @@ msgstr ""
 "<guilabel>système de secours</guilabel>, le <guilabel>test de mémoire</"
 "guilabel> et <guilabel>l'outil de détection du matériel</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Modifier la résolution de l'écran en pressant la touche F3 (en mode Grub "
 "Legacy uniquement)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2239,8 +2343,8 @@ msgstr ""
 "\"bold\">F6</emphasis> en mode Grub Legacy ou la touche <emphasis role=\"bold"
 "\">e</emphasis> en mode UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2251,22 +2355,13 @@ msgstr ""
 "affiche une nouvelle ligne appelée  <guilabel>Options de démarrage</"
 "guilabel> et propose quatre entrées :"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- par défaut. Cela ne modifie rien dans les options par défaut."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- sauvegarde des paramètres, la priorité étant donnée à la sécurité au "
-"détriment performances."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2274,8 +2369,8 @@ msgstr ""
 "- pas d'ACPI (Advanced Configuration and Power Interface), la gestion de "
 "l'alimention n'est pas prise en compte."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2284,8 +2379,8 @@ msgstr ""
 "concerne que le fonctionnement interne de l'Unité Centrale, sélectionnez "
 "cette option uniquement si on vous le demande."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2293,8 +2388,8 @@ msgstr ""
 "Si vous sélectionnez l'une de ces entrées, cela modifie les options par "
 "défaut affichées dans la ligne <guilabel>Options de démarrage</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2305,26 +2400,27 @@ msgstr ""
 "<guilabel>Options de démarrage</guilabel>, cependant elles sont bien prises "
 "en compte."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Ajouter plus d'options du noyau en pressant la touche F1 (en mode Grub "
 "Legacy uniquement)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2333,17 +2429,17 @@ msgstr ""
 "pressez \"Entrée\" pour obtenir plus de détails ou la touche d'échappement "
 "Esc pour revenir vers l'écran d'accueil."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2355,23 +2451,23 @@ msgstr ""
 "pour revenir vers la liste des options. Ces options peuvent être ajoutées "
 "manuellement sur la ligne <guilabel>options de Démarrage</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "L'aide est traduite dans la langue sélectionnée en pressant la touche F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2382,17 +2478,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Voici l'écran d'accueil par défaut si vous utilisez un CD d'installation par "
 "le Réseau (les images Boot.iso ou Boot-Nonfree.iso) :"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2404,27 +2506,24 @@ msgstr ""
 "d'installation par le Réseau, consulter <link ns2:href=\"https://wiki.mageia."
 "org/en/Boot.iso_install\">le Wiki Mageia</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Le clavier est Américain."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Les étapes de l'installation"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2433,7 +2532,7 @@ msgstr ""
 "suivies dans le panneau latéral à gauche de l'écran."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2443,7 +2542,7 @@ msgstr ""
 "supplémentaires moins communes."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2452,7 +2551,7 @@ msgstr ""
 "apporte davantage d'explications au sujet de l'étape en cours."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2473,18 +2572,18 @@ msgstr ""
 "simultanément sur les trois touches <guibutton>alt ctrl suppr</guibutton> "
 "pour redémarrer."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problèmes d'installation et solutions possibles"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Pas d'interface graphique"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2496,7 +2595,7 @@ msgstr ""
 "l'invite."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2511,13 +2610,13 @@ msgstr ""
 "mot \"boot:\". Tapez \"text\" et pressez ENTREE. Maintenant continuez "
 "l'installation en mode texte."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "L'installation se fige"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2531,13 +2630,13 @@ msgstr ""
 "cela, tapez <code>noauto</code> à l'invite. Cette option peut être combinée "
 "avec les précédentes si nécessaire.."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problème de mémoire vive"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2550,13 +2649,13 @@ msgstr ""
 "est la quantité correcte de RAM. Par exemple  <code>mem=256M</code> pour "
 "spécifier 256Mo de RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Partitions dynamiques"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4224,12 +4323,12 @@ msgstr ""
 "passage entre les dispositions latine et non latine."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Veuillez choisir la langue à utiliser"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4240,7 +4339,18 @@ msgstr ""
 "l'installation et pour le système une fois installé."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Sélectionner la langue désirée en déployant d'abord le continent concerné. "
+"<application>Mageia</application> utilisera cette sélection pendant "
+"l'installation et pour le système une fois installé."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4254,10 +4364,11 @@ msgstr ""
 "langues supplémentaires après l'installation."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4267,7 +4378,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4278,7 +4389,7 @@ msgstr ""
 "aussi marquée comme choisie dans l'écran des langues multiples."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4287,12 +4398,12 @@ msgstr ""
 "conseillé d'installer également la langue du clavier correspondante."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia utilise par défaut le codage UTF-8 (Unicode)"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4303,7 +4414,7 @@ msgstr ""
 "toutes les langues installées."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4360,12 +4471,12 @@ msgstr ""
 "à six boutons ou plus."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Ajouter ou Modifier une Entrée de Menu de Démarrage"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4374,7 +4485,7 @@ msgstr ""
 "utiliser le logiciel grub-customizer (disponible dans les dépots Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5180,3 +5291,50 @@ msgstr ""
 "La prochaine étape consistera à copier les fichiers sur le disque dur. Ceci "
 "peut prendre quelques minutes. A la fin, vous verrez s'afficher un écran "
 "vide pendant un certain temps, c'est normal."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Partitionnement de disque personnalisé"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- sauvegarde des paramètres, la priorité étant donnée à la sécurité au "
+#~ "détriment performances."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index 62bd2346..b15c9b9e 100644
--- a/docs/installer/hr.po
+++ b/docs/installer/hr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-24 09:34+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1214,12 +1214,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1230,7 +1230,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1239,7 +1239,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1247,86 +1247,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Particioniranje"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1334,14 +1340,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1354,43 +1360,43 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Koristi postojeće particije"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Koristi slobodni prostor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1398,7 +1404,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1409,7 +1415,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1418,12 +1424,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1431,22 +1438,22 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Izbriši i koristi cijeli disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ova će opcija koristiti cijeli pogon za Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1454,91 +1461,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Prilagođeno"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Particioniranje"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1546,7 +1554,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1555,7 +1563,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1567,17 +1575,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1624,7 +1632,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1633,7 +1641,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1683,7 +1691,7 @@ msgstr "Čestitamo"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1692,7 +1700,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1702,32 +1710,118 @@ msgstr ""
 "i sada je sigurno ukloniti instalcijski medij i napraviti reboot računala."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Uživajte!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
 msgstr ""
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis>Proizvođač</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generički</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatiram"
@@ -1791,12 +1885,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia instalacijski program"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1804,76 +1898,78 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Instalacijski zaslon dobrodošlice"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+msgid "Using a Mageia DVD"
 msgstr ""
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1881,119 +1977,111 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2001,37 +2089,42 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2039,48 +2132,45 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2092,18 +2182,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2111,7 +2201,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2120,13 +2210,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2135,13 +2225,13 @@ msgid ""
 "other options as necessary."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2149,13 +2239,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3506,12 +3596,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Molim izaberite jezik koji želite koristiti"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3519,7 +3609,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Završili ste instaliranje i konfiguriranje <application>Mageie</application> "
+"i sada je sigurno ukloniti instalcijski medij i napraviti reboot računala."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3528,10 +3628,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -3541,7 +3642,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3549,19 +3650,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3569,7 +3670,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3615,19 +3716,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4287,6 +4388,43 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Prilagođeno"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
 #, fuzzy
 #~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
diff --git a/docs/installer/hu.po b/docs/installer/hu.po
index ccc1153f..29115bc4 100644
--- a/docs/installer/hu.po
+++ b/docs/installer/hu.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-04-03 13:34+0000\n"
 "Last-Translator: Laszlo Espadas <kardiweb@protonmail.ch>\n"
 "Language-Team: Hungarian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1073,12 +1073,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1086,7 +1086,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1095,7 +1095,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1103,79 +1103,95 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partícionálás"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1183,14 +1199,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1199,43 +1215,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1243,7 +1259,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1254,7 +1270,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1263,31 +1279,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1295,102 +1317,108 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Egyéni"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Partícionálás"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1402,17 +1430,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1458,7 +1486,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1467,7 +1495,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1517,14 +1545,14 @@ msgstr "Gratulálunk"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1532,32 +1560,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
 msgstr ""
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr ""
@@ -1613,12 +1725,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1626,70 +1738,73 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+msgid "Using a Mageia DVD"
 msgstr ""
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+msgid "From this screen, it is possible to set some personal preferences:"
+msgstr ""
+
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1697,111 +1812,99 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -1809,35 +1912,39 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -1845,46 +1952,44 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1896,18 +2001,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -1915,7 +2020,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -1924,13 +2029,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -1939,13 +2044,13 @@ msgid ""
 "other options as necessary."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -1953,13 +2058,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3282,12 +3387,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Válasszon nyelvet"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3295,7 +3400,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3304,16 +3416,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3321,19 +3439,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3341,7 +3459,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3385,19 +3503,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4026,5 +4144,8 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid "Custom"
+#~ msgstr "Egyéni"
+
 #~ msgid "DVD"
 #~ msgstr "DVD"
diff --git a/docs/installer/id.po b/docs/installer/id.po
index c0c425fd..52849d55 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-07-17 09:04+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Indonesian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1319,12 +1319,12 @@ msgstr ""
 "sangat bijaksana jika Anda memilih yang sederhana."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1336,7 +1336,7 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1349,7 +1349,7 @@ msgstr ""
 "Anda tidak akan bisa berjalan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1360,7 +1360,7 @@ msgstr ""
 "melihat apa di dalamnya sebelum Anda memulai."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1369,7 +1369,7 @@ msgstr ""
 "lainnya, seperti flashdisk. Contohnya sda, sdb dan sdc jika ada tiga."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1378,26 +1378,30 @@ msgstr ""
 "partisi pada perangkat penyimpanan terpilih"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Untuk aksi lainnya: klik pada partisi yang diinginkan terlebih dahulu. Lalu "
 "tampilkan, atau pilih filesystem dan titik kait, ubah ukuran atau bersihkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Lanjutkan hingga Anda mengatur semua yang Anda inginkan."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik <guibutton>Selesai</guibutton> jika sudah siap."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
@@ -1407,52 +1411,53 @@ msgstr ""
 "Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Jika Anda menginstall Mageia pada sistem UEFI, periksa bahwa ESP (EFI System "
 "Partition) tersedia dan dimount dengan benar pada /boot/EFI (lihat di atas)"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Pemartisian"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1463,7 +1468,7 @@ msgstr ""
 "application> akan diinstall."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1472,7 +1477,7 @@ msgstr ""
 "tampilan dan isi perangkat disk Anda."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1485,12 +1490,12 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Gunakan Partisi yang Tersedia"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1499,12 +1504,12 @@ msgstr ""
 "ditemukan dan mungkin bisa digunakan untuk instalasi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Gunakan Ruang Kosong"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1513,12 +1518,12 @@ msgstr ""
 "ini akan menggunakannya untuk menginstall Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Gunakan Ruang Kosong pada Partisi Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1527,7 +1532,7 @@ msgstr ""
 "installer akan menawarkan untuk menggunakannya."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1537,7 +1542,7 @@ msgstr ""
 "beresiko sehingga Anda harus membuat cadangan file penting Anda!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1553,7 +1558,7 @@ msgstr ""
 "Sangat disarankan untuk membuat cadangan semua file pribadi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1567,37 +1572,37 @@ msgstr ""
 "kedua partisi. Lihat gambar di bawah."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Hapus dan gunakan Seluruh Disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Pilihan ini akan menggunakan seluruh perangkat untuk Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Perhatikan! Ini akan menghapus SEMUA data pada harddisk yang dipilih. Hati-"
 "hati!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1608,12 +1613,13 @@ msgstr ""
 "gunakan pilihan ini."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Sesuaian"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Menyesuaikan pemartisian disk dengan DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1621,87 +1627,86 @@ msgstr ""
 "Ini memberi Anda kendali penuh untuk menempatkan instalasi pada harddisk."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1711,7 +1716,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1730,17 +1735,17 @@ msgstr ""
 "berikut:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Selaraskan ke\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Ruang kosong di awal (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "Juga pastikan semua partisi dibuat dengan penomoran megabite."
@@ -1773,7 +1778,8 @@ msgstr "Dokumentasi Resmi Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1789,7 +1795,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1801,7 +1807,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1857,7 +1863,7 @@ msgstr "Selamat"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1868,7 +1874,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1879,7 +1885,7 @@ msgstr ""
 "menjalankan ulang komputer."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1888,7 +1894,7 @@ msgstr ""
 "sistem operasi pada komputer Anda (jika ada lebih dari satu)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1897,12 +1903,12 @@ msgstr ""
 "otomatis terpilih dan dijalankan."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Nikmatilah!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1911,6 +1917,92 @@ msgstr ""
 "berkontribusi untuk Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis>Pabrikan</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Umum</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Pemformatan"
@@ -1984,12 +2076,12 @@ msgstr ""
 "guibutton> untuk melanjutkan."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Installer Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2000,7 +2092,7 @@ msgstr ""
 "mungkin."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2008,52 +2100,57 @@ msgstr ""
 "Layar menu awal memiliki berbagai pilihan, akan tetapi bawaannya akan "
 "memulai installer, yang normalnya adalah yang Anda inginkan."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Layar Selamat Datang untuk Instalasi"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Gunakan bootloader Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Ini adalah layar sambutan baku ketika menggunakan DVD Mageia, yang pertama "
 "dengan sistem legacy dan yang kedua dengan sistem UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Dari layar awal ini dimungkinkan untuk mengatur beberapa pengaturan pribadi:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2061,22 +2158,22 @@ msgstr ""
 "Bahasa (untuk instalasi saja, mungkin berbeda dengan bahasa yang dipilih "
 "untuk sistem) dengan menekan tombol F2 (hanya mode Legacy)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Gunakan tombol panah untuk memilih bahasa, lalu tekan tombol Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2088,31 +2185,30 @@ msgstr ""
 "Penyelamat</guilabel>, <guilabel>Pengujian memori</guilabel> dan "
 "<guilabel>Peralatan Pendeteksian Perangkat Keras</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "Ubah resolusi layar dengan menekan tombol F3 (hanya mode Legacy)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2122,8 +2218,8 @@ msgstr ""
 "\">F6</emphasis> untuk mode legacy atau tombol <emphasis role=\"bold\">e</"
 "emphasis> untuk mode UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2133,22 +2229,13 @@ msgstr ""
 "salah satu opsi tambahan. Menu yang dipanggil dengan F6 menampilkan baris "
 "baru yang disebut <guilabel>Opsi boot</guilabel> dan menawarkan empat entri:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Baku, dia tidak mengubah apapun dalam opsi baku."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Pengaturan Aman, prioritas diberikan pada opsi aman untuk mengorbankan "
-"kinerja."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2156,8 +2243,8 @@ msgstr ""
 "- Tanpa ACPI (Advanced Configuration and Power Interface), manajemen daya "
 "tidak diterapkan."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2165,8 +2252,8 @@ msgstr ""
 "- Tanpa APIC Lokal (Local Advanced Programmable Interrupt Controller), ini "
 "untuk interupsi CPU, pilih opsi ini jika diminta."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2174,8 +2261,8 @@ msgstr ""
 "Ketika Anda memilih salah satu entri ini, dia akan mengubah opsi baku yang "
 "ditampilkan pada <guilabel>Opsi Boot</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2185,26 +2272,27 @@ msgstr ""
 "tidak muncul pada baris <guilabel>Opsi Boot</guilabel>, tetapi, sebenarnya "
 "mereka telah diterapkan."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Tambahkan lebih banyak opsi kernel dengan menekan tombol F1 (hanya mode "
 "Legacy)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2212,17 +2300,17 @@ msgstr ""
 "Pilih dengan tombol panah, lalu tekan Enter untuk melihat detil, atau tekan "
 "tombol Esc untuk kembali ke layar sambutan."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2234,22 +2322,22 @@ msgstr ""
 "Pilihan ini bisa ditambahkan secara manual di baris <guilabel>Opsi boot</"
 "guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Bantuan diterjemahkan ke dalam bahasa yang dipilih dengan tombol F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2260,17 +2348,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Ini adalah layar sambutan baku ketika menggunakan CD Instalasi Jaringan "
 "Kabel (image Boot.iso atau Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2282,27 +2376,24 @@ msgstr ""
 "Jaringan Kabel, lihat <link ns2:href=\"https://wiki.mageia.org/en/Boot."
 "iso_install\">Wiki Mageia</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Layout keyboard adalah layout Amerika."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Langkah-langkah instalasi"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2311,7 +2402,7 @@ msgstr ""
 "panel samping dari layar."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2321,7 +2412,7 @@ msgstr ""
 "terlalu dibutuhkan."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2330,7 +2421,7 @@ msgstr ""
 "penjelasan lebih tentang langkah yang sedang dijalani."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2351,18 +2442,18 @@ msgstr ""
 "bersamaan. Setelahnya, tekan <guibutton>Alt Ctrl Delete</guibutton> secara "
 "bersamaan untuk menjalankan ulang."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Masalah Instalasi dan Kemungkinan Solusinya"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Tidak Ada Antarmuka Grafis"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2374,7 +2465,7 @@ msgstr ""
 "pada baris perintah."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2388,13 +2479,13 @@ msgstr ""
 "dengan ENTER. Anda akan diberikan layar hitam dengan kata \"boot:\". Ketik "
 "\"text\" lalu tekan ENTER. Lalu lanjutkan dengan instalasi dalam mode teks."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Instalasi Membeku"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2408,13 +2499,13 @@ msgstr ""
 "code> pada baris perintah. Pilihan ini juga bisa dikombinasikan dengan "
 "pilihan lain seperlunya."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Masalah RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2426,13 +2517,13 @@ msgstr ""
 "menggunakan parameter <code>mem=xxxM</code>, di mana xxx adalah besar RAM "
 "yang benar. Misalnya <code>mem=256M</code> untuk menentukan RAM 256MB."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Partisi dinamis"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4011,12 +4102,12 @@ msgstr ""
 "pergantian layout keyboard di antara Latin dan bukan Latin"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Silakan pilih bahasa yang akan digunakan"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4027,7 +4118,18 @@ msgstr ""
 "instalasi dan pada sistem yang sudah terinstall."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Pilih bahasa yang Anda sukai dengan membentangkan daftar dari benua Anda. "
+"<application>Mageia</application> akan menggunakan pilihan ini selama "
+"instalasi dan pada sistem yang sudah terinstall."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4040,10 +4142,11 @@ msgstr ""
 "menambahkan dukungan bahasa tambahan setelah instalasi selesai."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4053,7 +4156,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4064,7 +4167,7 @@ msgstr ""
 "tersebut juga akan ditandai sudah dipilih di layar banyak bahasa."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4073,12 +4176,12 @@ msgstr ""
 "disarankan untuk menginstall bahasa dari keyboard yang digunakan juga."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4089,7 +4192,7 @@ msgstr ""
 "diinstall."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4144,19 +4247,19 @@ msgstr ""
 "tombol atau lebih."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Tambah atau Modifikasi Entri Menu Boot"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 #, fuzzy
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
@@ -4877,6 +4980,53 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Sesuaian"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Pengaturan Aman, prioritas diberikan pada opsi aman untuk mengorbankan "
+#~ "kinerja."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
diff --git a/docs/installer/it.po b/docs/installer/it.po
index 30b89358..4c369fcb 100644
--- a/docs/installer/it.po
+++ b/docs/installer/it.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-07-17 11:45+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1168,12 +1168,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partizionamento personalizzato con DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1185,7 +1185,7 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1198,7 +1198,7 @@ msgstr ""
 "literal> NON deve essere impostata, altrimenti il sistema non sarà avviabile."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1206,7 +1206,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1216,7 +1216,7 @@ msgstr ""
 "sono tre."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1225,76 +1225,81 @@ msgstr ""
 "partizioni sul dispositivo di storage selezionato."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Per tutte le altre azioni: premere anzitutto sulla partizione desiderata. "
 "Quindi visualizza o scegli il filesystem e il punto di mount, ridimensionala "
 "oppure cancellala."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continua sino a quando non avrai impostato tutto come desideri."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Quando hai completato premi <guibutton>Finito</guibutton> "
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partizionamento"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1302,14 +1307,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1322,12 +1327,12 @@ msgstr ""
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Utilizza le partizioni esistenti"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1336,12 +1341,12 @@ msgstr ""
 "Linux compatibili e potrebbero essere usate per l'installazione."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Utilizza lo spazio libero"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1350,12 +1355,12 @@ msgstr ""
 "per la tua nuova installazione di Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Usa lo spazio libero di una partizione Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1364,7 +1369,7 @@ msgstr ""
 "l'installer potrebbe offrirti di utilizzarla."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1372,7 +1377,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1383,7 +1388,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1392,37 +1397,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Formatta e utilizza tutto il disco"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Questa opzione userà l'intero disco per Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Nota bene! Questo cancellerà TUTTI i dati sull'hard drive selezionato. Fai "
 "attenzione!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1430,99 +1435,99 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Personalizzato"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Partizionamento personalizzato con DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1532,7 +1537,7 @@ msgstr ""
 "\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1544,17 +1549,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1589,7 +1594,8 @@ msgstr "La documentazione ufficiale di Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1605,7 +1611,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1617,7 +1623,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1670,7 +1676,7 @@ msgstr "Complimenti"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1681,7 +1687,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1689,7 +1695,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1698,7 +1704,7 @@ msgstr ""
 "diversi sistemi operativi del tuo computer (se ne possiedi più di uno)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1707,12 +1713,12 @@ msgstr ""
 "Mageia verrà automaticamente selezionata e avviata."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Divertiti!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1720,6 +1726,92 @@ msgstr ""
 "Visita www.mageia.org se hai delle domande o se vuoi contribuire a Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis>Venditore</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generico</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formattazione in corso"
@@ -1782,12 +1874,12 @@ msgstr ""
 "guibutton> per proseguire."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, l'assistente all'installazione di Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1798,7 +1890,7 @@ msgstr ""
 "possibile."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1806,52 +1898,57 @@ msgstr ""
 "Il menù iniziale ha diverse opzioni, in ogni caso quella di default avvierà "
 "l'installer che è normalmente tutto ciò di cui hai bisogno."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Schermata di benvenuto dell'installazione"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Disinstallare Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Ecco le schermate di benvenuto quanddo si utilizza una DVD di Mageia. La "
 "prima è con un sistema legacy, la seconda con un sistema UEFI."
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Per la prima schermata è possibile impostare qualche preferenza personale:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -1859,22 +1956,22 @@ msgstr ""
 "La lingua (per la sola installazione, può essere diversa da quella scelta "
 "per il sistema) premendo il tasto F2 (solo nella modalità Legacy)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Usa le frecce per scegliere la lingua e premi il tasto Invio."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1882,106 +1979,99 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "Cambia la risoluzione premendo F3 (solo nella modalità Legacy)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Default, non cambia niente nelle opzioni di default."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Aggiungi ulteriori opzioni kernel premendo il tasto F1 (solo nella modalità "
 "Legacy)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -1989,17 +2079,17 @@ msgstr ""
 "Selezionarne una con le frecce e premere Invio per avere maggiori dettagli o "
 "premere Esc per tornare indietro alla schermata di benvenuto."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2007,22 +2097,22 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "L'aiuto viene tradotto nella lingua scelta con il tasto F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2033,17 +2123,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Questo è la schermata di benvenuto di default quando si usa un'installazione "
 "CD Wired Network-based (immagini Boot.iso o Boot-Nonfree.iso:"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2051,27 +2147,24 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "La mappatura della tastiera è quella americana."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "I passi dell'installazione"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2080,7 +2173,7 @@ msgstr ""
 "pannello a lato dello schermo."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2090,7 +2183,7 @@ msgstr ""
 "richieste."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2099,7 +2192,7 @@ msgstr ""
 "ulteriori spiegazioni riguardo lo step corrente."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2111,18 +2204,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemi relativi all'installazione e soluzioni possibili"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Nessuna interfaccia grafica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2130,7 +2223,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2139,13 +2232,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "L'installazione si blocca"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2154,13 +2247,13 @@ msgid ""
 "other options as necessary."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problema relativo alla RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2168,13 +2261,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Partizioni dinamiche"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3694,12 +3787,12 @@ msgstr ""
 "caratteri latini e non-latini."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Scegli una lingua da utilizzare"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3707,7 +3800,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3716,16 +3816,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3733,19 +3837,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3753,7 +3857,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3806,19 +3910,19 @@ msgstr ""
 "pulsanti."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Aggiungi o modifica una Boot Menu Entry"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 #, fuzzy
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
@@ -4492,6 +4596,46 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizzato"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
diff --git a/docs/installer/ja.po b/docs/installer/ja.po
index 35c06e3a..fbbfe16c 100644
--- a/docs/installer/ja.po
+++ b/docs/installer/ja.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-07-17 11:51+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1114,12 +1114,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1131,7 +1131,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1140,7 +1140,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1148,87 +1148,91 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "パーティションの設定"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1236,14 +1240,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1256,43 +1260,43 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1300,7 +1304,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1311,7 +1315,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1320,35 +1324,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1356,99 +1360,99 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "カスタム"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "パーティションの設定"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1458,7 +1462,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1470,17 +1474,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1513,7 +1517,8 @@ msgstr ""
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1526,7 +1531,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1535,7 +1540,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1585,7 +1590,7 @@ msgstr "おめでとうございます"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1596,7 +1601,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1604,32 +1609,116 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
 msgstr ""
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr ""
@@ -1691,12 +1780,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1704,76 +1793,78 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr ""
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+msgid "Using a Mageia DVD"
 msgstr ""
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1781,119 +1872,111 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -1901,37 +1984,42 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -1939,48 +2027,45 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -1992,18 +2077,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2011,7 +2096,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2020,13 +2105,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2035,13 +2120,13 @@ msgid ""
 "other options as necessary."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2049,13 +2134,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3413,12 +3498,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "使用する言語を選んでください。"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3426,7 +3511,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3435,10 +3527,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -3448,7 +3541,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3456,19 +3549,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3476,7 +3569,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3522,19 +3615,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4198,6 +4291,44 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "カスタム"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
diff --git a/docs/installer/nb.po b/docs/installer/nb.po
index 6aa0ea5f..8b4cb4c3 100644
--- a/docs/installer/nb.po
+++ b/docs/installer/nb.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-04 22:17+0000\n"
 "Last-Translator: Karl Morten Ramberg <karl.m.ramberg@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1125,12 +1125,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Egendefinert partisjonering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1141,7 +1141,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1150,7 +1150,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1158,79 +1158,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
+msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
-msgstr ""
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partisjonering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1238,14 +1251,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1258,43 +1271,43 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Bruk gamle partisjoner"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Bruk ledig plass"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Bruk ledig plass på Microsoft Windows®-partisjonen"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1302,7 +1315,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1313,7 +1326,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1322,12 +1335,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1335,22 +1349,22 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Slett og bruk hele disken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Dette alternativet vil bruke hele disken for Mageia"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1358,91 +1372,93 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Selvvalgt"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Egendefinert partisjonering med DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Sett opp partisjonsstørrelser:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1450,7 +1466,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1459,7 +1475,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1471,17 +1487,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1514,7 +1530,8 @@ msgstr "Mageias Offisielle dokumentasjon"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1530,7 +1547,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1542,7 +1559,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1598,7 +1615,7 @@ msgstr "Gratulerer"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1607,7 +1624,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1615,32 +1632,118 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
 msgstr "Gå til www.mageia.org hvs du har spørsmål eller vil bidra til Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Sett opp partisjonsstørrelser:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generisk</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formater"
@@ -1702,12 +1805,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX er Mageia installereren"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1715,76 +1818,79 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Installasjons velkomstskjermen"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Bruker en Mageia oppstartslaster"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1792,119 +1898,111 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -1912,37 +2010,42 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -1950,48 +2053,45 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Installasjonsfasene"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2003,18 +2103,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installasjonsproblem og mulige løsninger"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Ikke Grafisk grensesnitt"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2022,7 +2122,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2031,13 +2131,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Installasjonen fryser"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2046,13 +2146,13 @@ msgid ""
 "other options as necessary."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2060,13 +2160,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamiske partisjoner"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3470,12 +3570,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Velg språk"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3483,7 +3583,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3492,16 +3599,20 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3509,19 +3620,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia bruker UTF-8 (Unicode) som standard."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3529,7 +3640,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3578,19 +3689,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Legg til eller endre et oppstartsmenypunkt"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4254,5 +4365,34 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid "Custom"
+#~ msgstr "Selvvalgt"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
 #~ msgid "DVD"
 #~ msgstr "DVD"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index 0413c7ba..1c78b199 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-02 00:34+0000\n"
 "Last-Translator: dragnadh <dragnadh@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1369,12 +1369,12 @@ msgstr ""
 "te zijn met uw keuze."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Aangepaste schijfpartitionering met DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1385,7 +1385,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1398,7 +1398,7 @@ msgstr ""
 "uw systeem niet opstarten."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1409,7 +1409,7 @@ msgstr ""
 "partitie wijzigen en zelfs bekijken wat ze bevatten voor u start."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1419,7 +1419,7 @@ msgstr ""
 "als er drie zijn."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1428,27 +1428,31 @@ msgstr ""
 "geselecteerde opslag apparaat te verwijderen."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Voor alle andere acties: Klik eerst op de gewenste partitie. Bekijk haar "
 "vervolgens, of kies een bestandssysteem en een koppelpunt, pas de grootte "
 "aan of verwijder haar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Ga verder totdat alles naar uw wensen is aangepast."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klik dan op <guibutton>Klaar</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1457,50 +1461,54 @@ msgstr ""
 "Systeem-Partitie) beschikbaar is en aangekoppeld op /boot/EFI (zie hieronder)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Als u Mageia op een Legacy/GPT-systeem installeert, zorg dan dat een BIOS-"
 "opstart-partitie beschikbaar is met het juist type"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partitionering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1511,7 +1519,7 @@ msgstr ""
 "<application>Mageia</application> te installeren."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1520,7 +1528,7 @@ msgstr ""
 "van de indeling en de inhoud van uw specifieke harde schijf (schijven)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1533,12 +1541,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Huidige partities gebruiken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1547,12 +1555,12 @@ msgstr ""
 "gevonden die gebruikt kunnen worden voor het installeren."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Vrije ruimte gebruiken"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1561,12 +1569,12 @@ msgstr ""
 "Mageia-installatie wilt gebruiken, kies dan deze optie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Gebruik vrije ruimte op een Windows Partitie"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1575,7 +1583,7 @@ msgstr ""
 "gebruiken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1586,7 +1594,7 @@ msgstr ""
 "van al uw belangrijke bestanden een reservekopie heeft!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1604,7 +1612,7 @@ msgstr ""
 "uw persoonlijke bestanden te maken op een andere schijf of lokatie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1617,12 +1625,13 @@ msgstr ""
 "links of rechts te slepen. Zie de schermafbeelding hieronder."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1630,24 +1639,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Volledige harde schijf wissen en gebruiken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Met deze optie zal de gehele schijf voor Mageia gebruikt worden."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Let op! Hierdoor zullen ALLE gegevens op de geselecteerde harde schijf "
 "gewist worden. Wees voorzichtig!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1658,12 +1667,13 @@ msgstr ""
 "verliezen."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Aangepaste schijfpartitionering"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Aangepaste schijfpartitionering met DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1672,12 +1682,13 @@ msgstr ""
 "uw harde schijf of schijven."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitiegroottes:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1686,7 +1697,7 @@ msgstr ""
 "de beschikbare ruimte volgens onderstaande regels gebruikt worden:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1695,30 +1706,30 @@ msgstr ""
 "partitie aangemaakt, voor /, er is geen aparte partitie  voor /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 "Als er meer dan 50 GB beschikbaar is, dan worden drie partities aangemaakt"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr "6/19e van de beschikbare ruimte gaat naar /, tot een maximum van 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19e gaat naar de swap-partitie, tot een maximum van 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "de rest (minimaal 12/19e) gaat naar /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1727,12 +1738,13 @@ msgstr ""
 "gemaakt worden: 50 GB /, 4 GB swap en alle overige ruimte gaat naar /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Als je een UEFI-systeem gebruikt, zal het ESP (EFI System Partition; EFI-"
 "systeempartitie) automatisch gevonden worden, of gemaakt worden als het niet "
@@ -1740,13 +1752,14 @@ msgstr ""
 "waarmee kan worden gecontroleerd of het juist gedaan is"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Als u gebruik maakt van een Legacy (ook bekend als CSM of BIOS) systeem met "
 "een GPT-schijf, dan moet u een BIOS-opstart-partitie aanmaken als u dit nog "
@@ -1756,12 +1769,12 @@ msgstr ""
 "selecteren als bestandssysteem type."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1769,7 +1782,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1778,7 +1791,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1797,17 +1810,17 @@ msgstr ""
 "gparted, te partitioneren en de volgende instellingen te gebruiken:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Uitlijnen met\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Vrije ruimte links (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1842,7 +1855,8 @@ msgstr "De Officiële Documentatie voor Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1858,7 +1872,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1870,7 +1884,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1927,7 +1941,7 @@ msgstr "Gefeliciteerd"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1936,7 +1950,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1947,7 +1961,7 @@ msgstr ""
 "verwijderen en uw computer herstarten."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1956,7 +1970,7 @@ msgstr ""
 "besturingssystemen op uw computer (als u er meer dan één heeft)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1965,12 +1979,12 @@ msgstr ""
 "Mageia automatisch geselecteerd en gestart."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Veel plezier!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1978,6 +1992,92 @@ msgstr ""
 "Bezoek www.mageia.org als u vragen heeft of als u wilt bijdragen aan Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitiegroottes:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Algemeen</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatteren"
@@ -2052,12 +2152,12 @@ msgstr ""
 "uw keus."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, het Mageia-installatieprogramma"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2068,7 +2168,7 @@ msgstr ""
 "ervaren gebruiker bent."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2077,53 +2177,58 @@ msgstr ""
 "verandert zal de installatie starten, wat gewoonlijk het enige is dat u "
 "nodig heeft."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Allereerste installatiewelkomsscherm"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "De Mageia-opstartlader gebruiken"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "De standaard welkomsschermen van de Mageia-DVD's ziet u hieronder. De eerste "
 "is in BIOS- of legacy-modus gestart, de tweede in UEFI-modus:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Vanuit dit eerste scherm is het mogelijk enkele persoonlijke voorkeuren in "
 "te stellen:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2131,22 +2236,22 @@ msgstr ""
 "De taal (enkel voor de installatie, deze kan verschillen van de gekozen taal "
 "voor het systeem) door op de F2-toets te drukken (niet in UEFI modus)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Selecteer een taal met de pijltoetsen en druk Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2158,31 +2263,30 @@ msgstr ""
 "<guilabel>Memory test</guilabel> en <guilabel>Hardware Detection Tool</"
 "guilabel> heeft."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "Wijzig de schermresolutie door op F3 te klikken (niet in UEFI-modus)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2192,8 +2296,8 @@ msgstr ""
 "te klikken in legacymodus of <emphasis role=\"bold\">e</emphasis> te typen "
 "in UEFI-modus."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2203,22 +2307,13 @@ msgstr ""
 "van de extra opties. Het F6-menu laat een nieuwe regel zien, genaamd "
 "<guilabel>Boot options</guilabel> en heeft vier mogelijkheden:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Default, het verandert niets aan de standaard opties."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Safe Settings, voorrang wordt gegeven aan de veiligste opties, ten koste "
-"van prestaties zoals snelheid."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2226,8 +2321,8 @@ msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), met energiebeheer "
 "wordt geen rekening gehouden."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2235,8 +2330,8 @@ msgstr ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), betreft "
 "CPU-onderbrekingen, selecteer deze optie als u dat gevraagd wordt."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2244,8 +2339,8 @@ msgstr ""
 "Indien u een van deze mogelijkheden selecteert, worden de standaard opties "
 "aangepast, die zichtbaar zijn in de <guilabel>Bootopties</guilabel>regel."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2255,24 +2350,25 @@ msgstr ""
 "kunnen worden, niet in de <guilabel>Bootopties</guilabel>regel, maar worden "
 "dan toch echt gebruikt."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr "Leer meer kernelopties via F1 (niet in UEFI modus)"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2280,17 +2376,17 @@ msgstr ""
 "pijltjestoetsen en druk op Enter om meer details te krijgen, of klik op de "
 "Esc toets om terug te gaan naar het welkomsscherm."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2302,22 +2398,22 @@ msgstr ""
 "gaan. Deze opties kunnen handmatig aan de <guilabel>Bootopties</"
 "guilabel>regel worden toegevoegd."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "De hulp wordt in de gekozen taal vertaald met de F2 toets."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2327,17 +2423,23 @@ msgstr ""
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link> (Engels)."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Hier is het standaard welkomsscherm van een kabelnetwerkgebaseerde "
 "Installatie CD (Boot.iso of Boot-Nonfree.iso image):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2349,27 +2451,24 @@ msgstr ""
 "installeren met boot.iso: <link ns2:href=\"https://wiki.mageia.org/en/Boot."
 "iso_install\">de Mageia Wiki</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "De toetsenbordindeling is de Amerikaanse."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "De Installatiestappen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2378,7 +2477,7 @@ msgstr ""
 "de volgende schermen zichtbaar zijn."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2388,7 +2487,7 @@ msgstr ""
 "gebruikelijke opties."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2397,7 +2496,7 @@ msgstr ""
 "uitleg geven over de desbetreffende stap."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2418,18 +2517,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton> in te drukken. Druk vervolgens simultaan "
 "op <guibutton>Alt Ctrl Delete</guibutton> om opnieuw op te starten."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installatieproblemen en mogelijke oplossingen"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Geen grafische interface"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2440,7 +2539,7 @@ msgstr ""
 "resolutie te gebruiken door \"vgalo\" te typen bij de \"boot:\"-prompt."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2454,13 +2553,13 @@ msgstr ""
 "bevestig met ENTER. U zult een zwart schrem zien met het woord \"boot:\". "
 "Typ \"text\" en druk op ENTER. Ga nu verder met installeren in tekstmodus."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Installatieblokkades"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2474,13 +2573,13 @@ msgstr ""
 "literal>\" bij de prompt om dit te proberen. Deze optie mag zonodig met "
 "beide vorige gecombineerd worden."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM-probleem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2493,13 +2592,13 @@ msgstr ""
 "hoeveelheid RAM is, bijv. \"<literal>mem=256M</literal>\" betekent 256MB aan "
 "RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamische partities"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4144,12 +4243,12 @@ msgstr ""
 "de Latijnse en niet-Latijnse indeling."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Taalkeuze"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4161,7 +4260,19 @@ msgstr ""
 "computer."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Kies hier uw voorkeurstaal na eerst de lijst voor uw continent uit te "
+"vouwen. <application>Mageia</application> zal deze selectie gebruiken "
+"tijdens het installeren en voor het straks geïnstalleerde systeem op uw "
+"computer."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4174,10 +4285,11 @@ msgstr ""
 "talen toe te voegen."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4187,7 +4299,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4198,7 +4310,7 @@ msgstr ""
 "\"Meerdere talen\" scherm. ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4207,12 +4319,12 @@ msgstr ""
 "later tijdens de installatie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia gebruikt standaard UTF-8 (Unicode) ondersteuning."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4223,7 +4335,7 @@ msgstr ""
 "compatibiliteit te kiezen. Die is dan van toepassing op al uw talen."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4278,12 +4390,12 @@ msgstr ""
 "of meer knoppen."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Wijzig een opstartmenu-ingang of voeg er een toe"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4293,7 +4405,7 @@ msgstr ""
 "bronnen van Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5084,3 +5196,50 @@ msgid ""
 msgstr ""
 "De volgende stap is het kopiëren van bestanden naar de harde schijf. Dit "
 "duurt enige minuten. Dan ziet u een poos een blanco scherm, dat is normaal."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Aangepaste schijfpartitionering"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Safe Settings, voorrang wordt gegeven aan de veiligste opties, ten "
+#~ "koste van prestaties zoals snelheid."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 3e389fe8..6e3ab8a3 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-02-10 17:18+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1292,12 +1292,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1305,7 +1305,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1318,7 +1318,7 @@ msgstr ""
 "to uruchomienie systemu."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1326,7 +1326,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1336,7 +1336,7 @@ msgstr ""
 "urządzenia."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1345,68 +1345,73 @@ msgstr ""
 "partycje znajdujące się na wybranym dysku."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Dla wszystkich innych działań: najpierw kliknij na wybraną partycję. "
 "Następnie możesz wybrać system plików, punkt montowania, zmienić rozmiar lub "
 "ją usunąć."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Kontynuuj aż do momentu gdy skonfigurujesz wszystko zgodnie ze swoimi "
 "preferencjami."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Jeśli wszystko zostało już ustawione kliknij <guibutton>Gotowe</guibutton>."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
@@ -1414,12 +1419,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partycjonowanie"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1429,7 +1434,7 @@ msgstr ""
 "propozycje instalatora dotyczące instalacji <application>Magei</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1438,7 +1443,7 @@ msgstr ""
 "twardego oraz jego zawartości."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1452,12 +1457,12 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Użyj istniejących partycji"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1466,12 +1471,12 @@ msgstr ""
 "linuksowe i mogą być użyte do instalacji."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Wykorzystaj wolne miejsce"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1480,12 +1485,12 @@ msgstr ""
 "wykorzystane do instalacji Magei."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Wykorzystaj wolne miejsce na partycji Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1494,7 +1499,7 @@ msgstr ""
 "zaproponuje, aby je wykorzystać."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1505,7 +1510,7 @@ msgstr ""
 "kopię zapasową ważnych plików!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1522,7 +1527,7 @@ msgstr ""
 "wskazane jest zrobienie kopii zapasowej ważnych plików."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1531,13 +1536,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
@@ -1545,22 +1550,22 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Wymaż i wykorzystaj cały dysk"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ta opcja użyje całego dysku dla Magei."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "Zauważ! WSZYSTKIE dane z wybranego dysku zostaną wymazane. Uważaj!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1570,12 +1575,13 @@ msgstr ""
 "dysku dane, których nie chcesz stracić, nie używaj tej opcji."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Własne"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Zaawansowany podział na partycje za pomocą DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1583,12 +1589,12 @@ msgstr ""
 "Ta opcja daje Ci całkowitą kontrolę nad sposobem przeprowadzenia instalacji."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1596,7 +1602,7 @@ msgstr ""
 "Instalator podzieli obecną przestrzeń odnosząc się do następujących zasad:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1605,7 +1611,7 @@ msgstr ""
 "partycja zostanie utworzona dla /, nie ma oddzielnej partycji dla /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1613,7 +1619,7 @@ msgstr ""
 "utworzone trzy partycje"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1621,18 +1627,18 @@ msgstr ""
 "maksimum wynosi 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 "1/19 przestrzeni zostanie przydzielona jako swap, jednak maksimum wynosi 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "Cała reszta (conajmniej 12/19) zostanie przydzielone dla /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1641,32 +1647,31 @@ msgstr ""
 "trzy partycje: 50GB dla /, 4GB dla swap i całą resztę dla /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
@@ -1674,14 +1679,14 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1698,17 +1703,17 @@ msgstr ""
 "pomocą innego narzędzia jak np. gparted. przy użyciu następujących ustawień:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1743,7 +1748,8 @@ msgstr "Oficjalna Dokumentacja dla Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1759,7 +1765,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1771,7 +1777,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1827,14 +1833,14 @@ msgstr "Gratulacje"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1845,26 +1851,26 @@ msgstr ""
 "komputer ponownie."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1873,6 +1879,92 @@ msgstr ""
 "odwiedź www.mageia.org"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis>Dostawca</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Własny</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatowanie"
@@ -1948,12 +2040,12 @@ msgstr ""
 "guibutton> aby kontynuować."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX instalator Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1964,7 +2056,7 @@ msgstr ""
 "aktualizację łatwą i przyjemną. "
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -1973,47 +2065,57 @@ msgstr ""
 "domyślnie rozpoczyna instalację i zazwyczaj będzie to wszystko czego "
 "potrzebujesz."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Ekran powitalny instalatora"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr ""
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Używanie bootloader'a Magei"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Już na pierwszym ekranie instalatora można ustawić niektóre parametry "
 "instalacji:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2021,20 +2123,21 @@ msgstr ""
 "Język (tylko dla procesu instalacji, może być inny niż ten, który wybierzesz "
 "dla zainstalowanego systemu) poprzez wciśnięcie klawisza F2"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Użyj strzałek aby wybrać język i naciśnij ENTER."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2046,27 +2149,28 @@ msgstr ""
 "<guilabel>System ratunkowy</guilabel>, <guilabel>Test pamięci</guilabel> "
 "oraz <guilabel>Program do detekcji sprzętu</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr " Aby zmienić rozdzielczość ekranu wciśnij F3."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2076,8 +2180,8 @@ msgstr ""
 "\">F6</emphasis> lub klawisza <emphasis role=\"bold\">e</emphasis> w trybie "
 "UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2088,78 +2192,71 @@ msgstr ""
 "nową linię <guilabel>Opcje uruchamiania</guilabel> oraz zaproponuje cztery "
 "opcje:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Domyślne - nie zmienia żadnej z domyślnych opcji."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Bezpieczne ustawienia - nadaje priorytet opcjom bezpiecznym kosztem "
-"wydajności."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr "- Bez ACPI - bez zarządzania energią."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr "- Bez lokalnego APIC - ma związek z przerwaniami procesora."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2167,35 +2264,41 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2203,25 +2306,25 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Etapy instalacji"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2230,7 +2333,7 @@ msgstr ""
 "lewej stronie ekranu instalatora."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2240,7 +2343,7 @@ msgstr ""
 "używanych opcji."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2250,7 +2353,7 @@ msgstr ""
 "instalacji."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2271,18 +2374,18 @@ msgstr ""
 "wciskając jednocześnie klawisze<guibutton>Alt Ctrl F2</guibutton>. Następnie "
 "zrebootuj komputer za pomocą klawiszy <guibutton>Alt Ctrl Delete</guibutton>."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemy z instalacją oraz możliwe rozwiązania"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Brak graficznego interfejsu"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2293,7 +2396,7 @@ msgstr ""
 "użyć niskiej rozdzielczości wpisując w linii komend <code>vgalo</code>."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2302,13 +2405,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Zawieszenie się instalacji"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2321,13 +2424,13 @@ msgstr ""
 "pominięta. Wpisz w linii komend <code>noauto</code>. Ta opcja może być "
 "łączona z innymi opcjami jeśli zajdzie taka potrzeba."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problem z pamięcią RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2339,13 +2442,13 @@ msgstr ""
 "parametr <code>mem=xxxM</code>, gdzie xxx jest poprawną ilością dostępnej "
 "pamięci RAM wyrażoną w MB, np. <code>mem=256M</code> oznacza 256MB."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamiczne partycje"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3762,12 +3865,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Wybór języka"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3778,7 +3881,18 @@ msgstr ""
 "podczas instalacji jak i w zainstalowanym systemie."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Wybierz preferowany język, najpierw rozwijając listę dla swojego kontynentu. "
+"<application>Mageia</application> będzie używać wybranego języka zarówno "
+"podczas instalacji jak i w zainstalowanym systemie."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3790,10 +3904,11 @@ msgstr ""
 "guibutton> aby je teraz dodać.  "
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -3803,7 +3918,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3814,7 +3929,7 @@ msgstr ""
 "również zaznaczony jako domyślny w oknie wyboru wielu języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -3824,12 +3939,12 @@ msgstr ""
 "klawiatury."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia używa wsparcia UTF-8 (Unicode) domyślnie."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3840,7 +3955,7 @@ msgstr ""
 "wszystkich zainstalowanych języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3890,19 +4005,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Dodaj lub zmodyfikuj wpis Boot Menu"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4566,6 +4681,28 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+#~ "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/"
+#~ "> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Własne"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Bezpieczne ustawienia - nadaje priorytet opcjom bezpiecznym kosztem "
+#~ "wydajności."
+
 #~ msgid "DVD"
 #~ msgstr "DVD"
 
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 5fad56fb..819a40d4 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-06-01 20:02+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
@@ -1380,12 +1380,12 @@ msgstr ""
 "seleções."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Personalização do particionamento de disco com DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1396,7 +1396,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1409,7 +1409,7 @@ msgstr ""
 "literal> NÃO deve ser feita, caso contrário, seu sistema não inicializará."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1420,7 +1420,7 @@ msgstr ""
 "mesmo ver o que está neles antes de começar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1430,7 +1430,7 @@ msgstr ""
 "deles."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1439,27 +1439,31 @@ msgstr ""
 "no dispositivo de armazenamento selecionado."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Para todas as outras ações: clicar na partição desejada primeiro. Em "
 "seguida, visualizá-la, ou escolher um sistema de arquivos e um ponto de "
 "montagem, redimensioná-la ou limpá-la."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continue até que você ajustar tudo como desejar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Click <guibutton>Ok</guibutton> quando estiver pronto."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1469,50 +1473,54 @@ msgstr ""
 "(veja abaixo)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Se você estiver instalando o Mageia em um sistema Legacy / GPT, verifique se "
 "uma partição de inicialização do BIOS está presente com um tipo correto"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Particionamento"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1523,7 +1531,7 @@ msgstr ""
 "instalar <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1532,7 +1540,7 @@ msgstr ""
 "conteúdo específicos do(s) seu(s) disco(s) rígido(s)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1545,12 +1553,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Utilizar as partições existentes"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1559,12 +1567,12 @@ msgstr ""
 "o Linux foram encontrados e podem ser utilizadas para a instalação."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Usar o espaço livre"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1573,12 +1581,12 @@ msgstr ""
 "usá-lo para a sua nova instalação da Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Use o espaço livre na partição do Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1587,7 +1595,7 @@ msgstr ""
 "instalador pode oferecer para usá-lo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1598,7 +1606,7 @@ msgstr ""
 "ter um backup de todos os arquivos importantes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1615,7 +1623,7 @@ msgstr ""
 "altamente recomendável fazer backup de seus arquivos pessoais."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1628,12 +1636,13 @@ msgstr ""
 "arrastando a lacuna entre as duas partições. Veja a captura de tela abaixo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1641,24 +1650,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Apagar e utilizar o Disco Inteiro."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Esta opção utilizará a unidade completa para a Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Atenção! Esta operação apagará todos os dados do disco rígido selecionado. "
 "Tenha cuidado!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1669,12 +1678,13 @@ msgstr ""
 "opção."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Personalizado"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Personalização do particionamento de disco com DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1683,12 +1693,13 @@ msgstr ""
 "rígido(s)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionamento de partições:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1697,7 +1708,7 @@ msgstr ""
 "regras:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1706,7 +1717,7 @@ msgstr ""
 "criada para /, não haverá nenhuma partição separada para /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1714,23 +1725,23 @@ msgstr ""
 "criadas"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr "6/19 do espaço total disponível é atribuída a / com um máximo de 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 é alocado para área de troca com um máximo de 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "o restante (pelo menos 12/19) é atribuído ao /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1740,12 +1751,13 @@ msgstr ""
 "para /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Se você estiver usando um sistema UEFI, o ESP (EFI partição do sistema) será "
 "detectada automaticamente, ou criada se ela não existir ainda, e montada em /"
@@ -1753,13 +1765,14 @@ msgstr ""
 "feita corretamente"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Se você estiver usando um sistema Legacy (como conhecido como CSM ou BIOS) "
 "com um disco GPT, você precisará criar uma partição de inicialização do Bios "
@@ -1769,12 +1782,12 @@ msgstr ""
 "partição de inicialização do BIOS como tipo de sistema de arquivos."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1782,7 +1795,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1791,7 +1804,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1810,17 +1823,17 @@ msgstr ""
 "alternativo, tipo o gparted, e use a seguinte configuração:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Arredondar para\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Espaço livre Antes (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1855,7 +1868,8 @@ msgstr "A documentação oficial para Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1871,7 +1885,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1883,7 +1897,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1939,7 +1953,7 @@ msgstr "Parabéns"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1948,7 +1962,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1958,7 +1972,7 @@ msgstr ""
 "agora é seguro remover a mídia de instalação e reiniciar o seu computador."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1968,7 +1982,7 @@ msgstr ""
 "(se você tiver mais de um)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1977,12 +1991,12 @@ msgstr ""
 "instalação Mageia será automaticamente selecionada e iniciada."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Divirta-se!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1991,6 +2005,92 @@ msgstr ""
 "a Mageia."
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionamento de partições:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generic</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatação"
@@ -2066,12 +2166,12 @@ msgstr ""
 "<guibutton>Próximo</guibutton> para continuar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, o Instalador da Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2082,7 +2182,7 @@ msgstr ""
 "possível."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2090,53 +2190,58 @@ msgstr ""
 "A tela do menu inicial tem várias opções, porém a opção padrão irá iniciar o "
 "instalador, que será, normalmente, tudo o que você irá precisar."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Primeira Tela da Instalação"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Usando o Gerenciador de Inicialização da Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Aqui estão as telas de boas-vindas padrão ao usar um DVD Mageia, o primeiro "
 "com um sistema legado e a segunda com um sistema UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "A partir desta primeira tela, é possível definir algumas preferências "
 "pessoais:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2144,22 +2249,22 @@ msgstr ""
 "A língua (para a instalação só, pode ser diferente, que a língua escolhida "
 "para o sistema), pressionar a tecla F2 (para modo herdado único)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Use as setas para selecionar o idioma e pressione a tecla Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2171,32 +2276,31 @@ msgstr ""
 "Sistema</guilabel>, <guilabel>teste de memória</guilabel> e <guilabel> "
 "ferramenta de detecção de Hardware</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Alterar a resolução da tela, pressionando a tecla F3 (modo herdado apenas)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2206,8 +2310,8 @@ msgstr ""
 "\">F6</emphasis> chave para o modo de legado <emphasis role = \"bold\">ou</"
 "emphasis> a chave para o modo de UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2218,22 +2322,13 @@ msgstr ""
 "chamada <guilabel>opções de inicialização</guilabel> e propor quatro "
 "entradas:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Padrão, ele não altera nada nas opções padrão."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Configurações Seguras, é dada prioridade às opções mais seguras, em "
-"detrimento de performances."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2241,8 +2336,8 @@ msgstr ""
 "- No ACPI (Advanced Configuration and Power Interface), gerenciamento de "
 "energia não é levado em conta."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2250,8 +2345,8 @@ msgstr ""
 "- No APIC local (Local avançada Controlador de interrupção programável), "
 "trata-se de interrupções de CPU, selecione essa opção se você pediu."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2259,8 +2354,8 @@ msgstr ""
 "Quando você seleciona uma destas entradas, ele modifica as opções padrão "
 "exibido nas <guilabel>opções de inicialização</guilabel> linha."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2270,26 +2365,27 @@ msgstr ""
 "com a tecla F6 não aparecer nas  <guilabel>opções de inicialização</"
 "guilabel> linha, no entanto, eles são realmente levados em conta."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Adicionar mais opções de kernel, pressionando a tecla F1 (apenas modo "
 "Legado)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2297,17 +2393,17 @@ msgstr ""
 "com as teclas de seta e pressione Enter para ter mais detalhes ou pressione "
 "a tecla Esc para voltar para a tela de boas-vindas."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2319,22 +2415,22 @@ msgstr ""
 "de opções. Essas opções podem por adicionados à mão nas  <guilabel>opções de "
 "inicialização</guilabel> linha."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "A ajuda é traduzida no idioma escolhido com a tecla F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2345,17 +2441,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Aqui é a tela de boas-vindas padrão ao usar um CD de instalação baseado em "
 "rede com fio (boot.iso ou Boot-Nonfree.iso imagens):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2367,27 +2469,24 @@ msgstr ""
 "rede com fio, consulte <link ns2:href=\"https://wiki.mageia.org/en/Boot."
 "iso_install\"> o Mageia Wiki</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "O layout do teclado é o americano."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "As etapas de instalação"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2396,7 +2495,7 @@ msgstr ""
 "seguido no painel lateral da tela."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2406,7 +2505,7 @@ msgstr ""
 "necessárias."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2415,7 +2514,7 @@ msgstr ""
 "explicações sobre a etapa atual."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2436,18 +2535,18 @@ msgstr ""
 "guibutton> ao mesmo tempo. Depois disso, pressione <guibutton>Ctrl Alt "
 "Delete</guibutton> simultaneamente, para reiniciar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemas de Instalação e Possíveis Soluções"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Sem Interface Gráfica"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2459,7 +2558,7 @@ msgstr ""
 "texto)."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2473,13 +2572,13 @@ msgstr ""
 "será presenteado com uma tela preta com a palavra \"boot:\". Digite \"texto"
 "\" e pressione ENTER. Agora continue com a instalação em modo texto."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "A Instalação Congela"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2493,13 +2592,13 @@ msgstr ""
 "<code>noauto</code> no prompt (tela modo-texto). Esta opção pode também ser "
 "combinada com outras opções, conforme necessário."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "problema RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2512,13 +2611,13 @@ msgstr ""
 "a correta quantidade de RAM. Por exemplo <code>mem=256M</code> irá "
 "especificar 256MB de RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "partições dinâmicas"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4166,12 +4265,12 @@ msgstr ""
 "layouts de teclados latinos e não latinos."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Por favor, escolha um idioma para usar"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4182,7 +4281,18 @@ msgstr ""
 "seleção durante a instalação e para o sistema instalado."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Selecione o seu idioma preferido, pela primeira ampliação da lista para o "
+"seu continente. A <application>Mageia</application> irá utilizar essa "
+"seleção durante a instalação e para o sistema instalado."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4195,10 +4305,11 @@ msgstr ""
 "difícil adicionar o suporte a idiomas adicionais após a instalação."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4208,7 +4319,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4219,7 +4330,7 @@ msgstr ""
 "marcado como escolhido na tela de múltiplos idiomas."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4228,12 +4339,12 @@ msgstr ""
 "aconselhável instalar o idioma do teclado também."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia usa o suporte UTF-8 (Unicode) por padrão."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4244,7 +4355,7 @@ msgstr ""
 "instalados."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4300,12 +4411,12 @@ msgstr ""
 "botões."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Adicionando ou Modificando uma Entrada do Menu de Inicialização"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4314,7 +4425,7 @@ msgstr ""
 "usar o software grub-customizer (disponível nos repositórios Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5115,3 +5226,50 @@ msgstr ""
 "O próximo passo é a cópia de arquivos no disco rígido. Isso leva alguns "
 "minutos. No final, você recebe uma tela em branco por algum tempo, isso é "
 "normal."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizado"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Configurações Seguras, é dada prioridade às opções mais seguras, em "
+#~ "detrimento de performances."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index c00f4130..38406f9a 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-10-28 16:09+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1381,12 +1381,12 @@ msgstr ""
 "recomandă să fiți prudent în alegeri."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Partiționare de disc personalizată cu DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1398,7 +1398,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1411,7 +1411,7 @@ msgstr ""
 "putea demara."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1422,7 +1422,7 @@ msgstr ""
 "dimensiunea și chiar vizualiza conținutul ei înainte de a începe."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1431,7 +1431,7 @@ msgstr ""
 "de stocare, precum o cheie USB. De exemplu: sda, sdb și sdc dacă sînt trei."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1440,27 +1440,31 @@ msgstr ""
 "toate partițiile de pe dispozitivul de stocare selectat."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Pentru toate celelalte acțiuni: faceți mai întîi clic pe partiția dorită. "
 "Apoi o puteți vizualiza, alege un sistem de fișiere sau punct de montare, "
 "redimensiona sau chiar șterge."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Continuați pînă cînd ajustați totul așa cum doriți."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Apăsați pe <guibutton>Gata</guibutton> cînd sînteți pregătit."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
@@ -1470,52 +1474,53 @@ msgstr ""
 "EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Dacă instalați Mageia pe un sistem UEFI, verificați că o partiție de sistem "
 "EFI (ESP) este prezentă și montată corect în /boot/EFI (a se vedea mai sus)"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partiționare"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1526,7 +1531,7 @@ msgstr ""
 "<application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1535,7 +1540,7 @@ msgstr ""
 "partiționare și conținutul discurilor."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1548,12 +1553,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Utilizează partițiile existente"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1562,12 +1567,12 @@ msgstr ""
 "compatibile Linux au fost găsite și pot fi utilizate pentru instalare."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Utilizează spațiul liber"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1576,12 +1581,12 @@ msgstr ""
 "utiliza pentru noua instalare de Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Utilizează spațiul liber de pe o partiție Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1590,7 +1595,7 @@ msgstr ""
 "vă poate propune să-l utilizeze."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1601,7 +1606,7 @@ msgstr ""
 "că v-ați salvat toate datele importante!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1618,7 +1623,7 @@ msgstr ""
 "Este foarte recomandat să vă salvați toate fișierele personale."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1632,37 +1637,37 @@ msgstr ""
 "imaginea de mai jos."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Șterge și utilizează tot discul."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Această opțiune va utiliza tot discul pentru Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "ATENȚIE: aceasta va șterge TOATE datele de pe discul selecționat. Aveți "
 "grijă!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1673,12 +1678,13 @@ msgstr ""
 "această opțiune."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Personalizat"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Partiționare de disc personalizată cu DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1687,12 +1693,13 @@ msgstr ""
 "dure."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1700,7 +1707,7 @@ msgstr ""
 "Instalatorul va împărți spațiul disponibil pe disc după următoarele reguli:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1709,7 +1716,7 @@ msgstr ""
 "partiție pentru /, nu se va crea și o partiție separată pentru /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1717,7 +1724,7 @@ msgstr ""
 "partiții"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1725,17 +1732,17 @@ msgstr ""
 "Go"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 va fi alocat pentru swap cu un maximum de 4 Go"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "restul spațiului (de cel puțin 12/19) va vi alocat pentru /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1744,12 +1751,13 @@ msgstr ""
 "crea trei partiții: 50 Go pentru /, 4 Go pentru swap și restul pentru /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Dacă utilizați un sistem UEFI, partiția ESP (EFI System Partition) va fi "
 "detectată automat sau creată dacă nu există încă și montată în /boot/EFI. "
@@ -1757,30 +1765,29 @@ msgstr ""
 "acest lucru a fost făcut corect."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1790,7 +1797,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1809,17 +1816,17 @@ msgstr ""
 "gparted, sau să folosiți parametrii următori:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Aliniază la\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Spațiu liber precedent (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1854,7 +1861,8 @@ msgstr "Documentația oficială pentru Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1870,7 +1878,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1882,7 +1890,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1939,7 +1947,7 @@ msgstr "Felicitări"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1950,7 +1958,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1961,7 +1969,7 @@ msgstr ""
 "redemara calculatorul."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1971,7 +1979,7 @@ msgstr ""
 "de unul)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1980,12 +1988,12 @@ msgstr ""
 "fi selectată și pornită automat."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Profitați!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1994,6 +2002,92 @@ msgstr ""
 "la Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Dimensionarea partițiilor:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Generic</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatare în curs"
@@ -2065,12 +2159,12 @@ msgstr ""
 "guibutton> pentru a continua."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instalatorul Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2081,7 +2175,7 @@ msgstr ""
 "se poate de ușor."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2089,51 +2183,56 @@ msgstr ""
 "Meniul din ecranul inițial are diferite opțiuni, iar cea implicită este cea "
 "care va lansa instalatorul, care în mod normal este tot ceea ce vă trebuie."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Ecranul de bun venit al instalării"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Se utilizează un încărcător de sistem Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Iată ecranele de întîmpinare implicite cînd utilizați un DVD Mageia. Primul "
 "cu un sistem vechi, iar al doilea cu un sistem UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "Din acest prim ecran se pot defini cîteva preferințe personale:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2141,23 +2240,23 @@ msgstr ""
 "Limba (doar pentru instalare, poate fi diferită de limba aleasă pentru "
 "sistem) apăsînd tasta F2 (numai în modul vechi)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Utilizați tastele săgeți pentru a selecționa limba și apăsați tasta ENTER."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2169,31 +2268,30 @@ msgstr ""
 "<guilabel>Recuperare sistem</guilabel>, <guilabel>Test de memorie</guilabel> "
 "și <guilabel>Unealta de detecție materială</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "Schimbați rezoluția ecranului apăsînd tasta F3 (numai în modul vechi)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2203,8 +2301,8 @@ msgstr ""
 "emphasis> pentru modul vechi sau tasta <emphasis role=\"bold\">e</emphasis> "
 "pentru modul UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2215,22 +2313,13 @@ msgstr ""
 "linie nouă intitulată <guilabel>Opțiuni de demaraj</guilabel> și propune "
 "patru intrări:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Implicit, nu modifică nimic în opțiunile implicite."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Parametri siguri, prioritatea este oferită opțiunilor mai sigure în "
-"detrimentul performanțelor. "
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2238,8 +2327,8 @@ msgstr ""
 "- Fără ACPI (Advanced Configuration and Power Interface), gestionarea "
 "energiei nu este luată în considerare."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2248,8 +2337,8 @@ msgstr ""
 "vorba de întreruperile la nivel de procesor, selectați această opțiune dacă "
 "sînteți întrebat."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2257,8 +2346,8 @@ msgstr ""
 "Cînd selecționați una din aceste intrări, se modifică opțiunile implicite "
 "afișate pe linia <guilabel>Opțiuni de demaraj</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2268,25 +2357,26 @@ msgstr ""
 "tasta F6 să nu apară în linia <guilabel>Opțiuni de demaraj</guilabel>, însă "
 "acestea sînt luate în considerare."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Adăugați mai multe opțiuni nucleului apăsînd tasta F1 (numai în modul vechi)"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2295,17 +2385,17 @@ msgstr ""
 "mai multe detalii, sau apăsați tasta ESC pentru a reveni la ecranul de "
 "întîmpinare."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2317,22 +2407,22 @@ msgstr ""
 "cu opțiuni. Aceste opțiuni pot fi adăugate manual în linia <guilabel>Opțiuni "
 "de demaraj</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Cu tasta F2 aveți ajutorul tradus în limba aleasă."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2343,17 +2433,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Acesta este ecranul de întîmpinare implicit cînd se utilizează un CD de "
 "instalare prin rețea filară (imaginea Boot.iso sau Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2365,27 +2461,24 @@ msgstr ""
 "prin rețea filară, consultați <link ns2:href=\"https://wiki.mageia.org/en/"
 "Boot.iso_install\">Mageia Wiki</link>."
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Dispunerea tastaturii este cea americană."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Etapele instalării"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2394,7 +2487,7 @@ msgstr ""
 "fi urmărite în acest panou lateral al ecranului."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2404,7 +2497,7 @@ msgstr ""
 "mai puțin necesare."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2413,7 +2506,7 @@ msgstr ""
 "multe explicații pentru etapa actuală."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2433,18 +2526,18 @@ msgstr ""
 "<guibutton>Alt Ctrl F2</guibutton> în același timp, apoi apăsați "
 "<guibutton>Alt Ctrl Delete</guibutton> simultan pentru a reporni."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Probleme de instalare și soluții posibile"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Fără interfață grafică"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2455,7 +2548,7 @@ msgstr ""
 "utilizați o rezoluție mai mică tastînd <code>vgalo</code> la prompter."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2470,13 +2563,13 @@ msgstr ""
 "Tastați „text” și apăsați ENTER. Acum puteți continua cu instalarea în mod "
 "text."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Instalarea îngheață"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2491,13 +2584,13 @@ msgstr ""
 "prompter. Dacă este nevoie, această opțiune poate fi combinată și cu alte "
 "opțiuni."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problemă de memorie"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2509,13 +2602,13 @@ msgstr ""
 "manual, utilizați parametrul <code>mem=xxxM</code>, une xxx este cantitatea "
 "corectă de RAM. Ex: <code>mem=256M</code> va specifica 256Mo de RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Partiții dinamice"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4191,12 +4284,12 @@ msgstr ""
 "dispunerea latină și non-latină."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Alegeți limba ce va fi utilizată"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4207,7 +4300,18 @@ msgstr ""
 "instalării și după pentru pentru sistemul instalat."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Selectați limba preferată, desfășurînd mai întîi lista continentului. "
+"<application>Mageia</application> va utiliza această alegere pe parcursul "
+"instalării și după pentru pentru sistemul instalat."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4221,10 +4325,11 @@ msgstr ""
 "instalare."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4234,7 +4339,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4245,7 +4350,7 @@ msgstr ""
 "indicată drept limba preferată în ecranul multilingv."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4254,12 +4359,12 @@ msgstr ""
 "recomandat să instalați și limba pentru dispunerea tastaturii."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia utilizează UTF-8 (Unicode) implicit."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4270,7 +4375,7 @@ msgstr ""
 "tuturor limbilor instalate."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4325,19 +4430,19 @@ msgstr ""
 "șase sau mai multe butoane."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Adăugați sau modificați o intrare din meniul de demaraj"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 #, fuzzy
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
@@ -5097,6 +5202,54 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizat"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Parametri siguri, prioritatea este oferită opțiunilor mai sigure în "
+#~ "detrimentul performanțelor. "
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 9f29d38b..046b7442 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-11-04 13:11+0000\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1410,12 +1410,12 @@ msgstr ""
 "автоматически. Опять же, стоит параметры выбирать очень осторожно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ручное разделение диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1427,7 +1427,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1440,7 +1440,7 @@ msgstr ""
 "иначе загрузка системы станет невозможной."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1452,7 +1452,7 @@ msgstr ""
 "разделов до внесения изменений."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1462,7 +1462,7 @@ msgstr ""
 "если будет обнаружено три диска."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1471,10 +1471,14 @@ msgstr ""
 "выбранном носителе данных были очищены."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Чтобы выполнить любое другое действие, сначала отметьте область "
 "соответствующего раздела. Затем просмотрите данные по разделу, измените его "
@@ -1482,21 +1486,21 @@ msgstr ""
 "разделы."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Повторяйте эти действия для всех соответствующих разделов, пока все не "
 "станет так, как вы хотите."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Нажмите кнопку <guibutton>Выполнено</guibutton>, когда настройки будут "
 "завершены."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
@@ -1506,52 +1510,53 @@ msgstr ""
 "ESP (EFI System Partition) и она смонтирована в  /boot/EFI (см. Выше)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Если вы устанавливаете Mageia в систему с UEFI, убедитесь, что существует "
 "ESP (EFI System Partition) и она смонтирована в  /boot/EFI (см. Выше)."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Разбиение на разделы"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1562,7 +1567,7 @@ msgstr ""
 "о месте установки <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1571,7 +1576,7 @@ msgstr ""
 "компьютера и содержимого дисков."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1584,12 +1589,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Использовать существующие разделы"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1599,12 +1604,12 @@ msgstr ""
 "системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Использовать свободное место"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1613,12 +1618,12 @@ msgstr ""
 "свободное место, достаточное для установки новой системы Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Использовать свободное место на разделе Microsoft Windows®"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1627,7 +1632,7 @@ msgstr ""
 "Windows достаточно свободного места для установки новой операционной системы."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1638,7 +1643,7 @@ msgstr ""
 "предварительно создать резервные копии важных для вас файлов!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1656,7 +1661,7 @@ msgstr ""
 "создать резервные копии важных для вас файлов."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1670,39 +1675,39 @@ msgstr ""
 "ниже снимок экрана."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Стереть и использовать весь диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 "При использовании этого варианта для установки Mageia будет использован весь "
 "диск."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Замечание: все данные на диске будут в таком случае уничтожены. Будьте "
 "осторожны!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1713,12 +1718,13 @@ msgstr ""
 "вариантом."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Вручную"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Ручное разделение диска на разделы с помощью DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1727,12 +1733,13 @@ msgstr ""
 "разделов на вашем диске в соответствии с вашими предпочтениями."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Размер разделов:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1741,7 +1748,7 @@ msgstr ""
 "правилами:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1750,30 +1757,30 @@ msgstr ""
 "раздел для / без отдельного раздела для /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr "Если общее доступное место более, чем 50 Гб, то создаются три раздела"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 от общего доступного пространства выделяется под / с максимумом 50 Гб"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 выделяется под своп с максимумом 4 Гб"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "остальное (по крайней мере 12/19) выделяется под /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1782,12 +1789,13 @@ msgstr ""
 "создаст три раздела: 50 Гб для /, 4 ГБ для свопа, а остальное для /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Если вы используете систему UEFI, то ESP (Системный раздел EFI) будет "
 "автоматически обнаружен или создан, если он ещё не существует, и смонтирован "
@@ -1795,30 +1803,29 @@ msgstr ""
 "проверить, что это было сделано правильно"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1828,7 +1835,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1847,17 +1854,17 @@ msgstr ""
 "gparted с такими параметрами:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "«Выровнять по» «МиБ»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "«Свободное место до (МиБ)» «2»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "Также следует создавать разделы только с чётным размером в мегабайтах."
@@ -1890,7 +1897,8 @@ msgstr "Официальная документация для Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1907,7 +1915,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1919,7 +1927,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1976,7 +1984,7 @@ msgstr "Поздравляем"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1987,7 +1995,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1997,7 +2005,7 @@ msgstr ""
 "извлекать носитель для установки системы и перезагружать компьютер."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -2007,7 +2015,7 @@ msgstr ""
 "несколько систем)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2016,12 +2024,12 @@ msgstr ""
 "запустится установленная вами операционная система Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Приятной работы!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2030,6 +2038,92 @@ msgstr ""
 "Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Размер разделов:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Общий</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Форматирование"
@@ -2104,12 +2198,12 @@ msgstr ""
 "чтобы продолжить работу с программой."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, программа для установки Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2120,7 +2214,7 @@ msgstr ""
 "системы прошло как можно проще для вас."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2129,51 +2223,56 @@ msgstr ""
 "Типичным будет пункт запуска программы для установки системы. Обычно, это "
 "именно тот пункт, который вам нужен."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Приветственное окно программы установки"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Использование загрузчика Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Ниже приведены стандартные окна приветствия DVD Mageia. Первое из них "
 "соответствует устаревшей версии системы, второе - системе с UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "С помощью первой страницы можно указать некоторые личные предпочтения:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2181,24 +2280,24 @@ msgstr ""
 "Язык (на время установки, в системе может быть выбран совсем другой язык) "
 "можно выбрать после нажатия клавиши F2 (только в устаревшем режиме)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Используйте клавиши со стрелками, чтобы выбрать нужный вам пункт в списке, и "
 "нажмите клавишу Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2210,33 +2309,32 @@ msgstr ""
 "<guilabel>Тест памяти</guilabel> и <guilabel>Инструмент поиска оборудования</"
 "guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Изменить разрешение экрана можно с помощью нажатия клавиши F3 (только в "
 "устаревшем режиме)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2246,8 +2344,8 @@ msgstr ""
 "\">F6</emphasis> в режиме устаревшей системы или клавиши  <emphasis role="
 "\"bold\">e</emphasis> в режиме UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2259,22 +2357,13 @@ msgstr ""
 "показан новый пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметры "
 "загрузки</guilabel>) с такими четырьмя подпунктами:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Default (по умолчанию), не менять ничего в параметрах по умолчанию."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Safe Settings (безопасные параметры), преимущество параметров безопасности "
-"над быстродействием."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2282,8 +2371,8 @@ msgstr ""
 "- No ACPI (без расширенного интерфейса настройки и управления питанием), не "
 "принимать во внимание параметры управления питанием."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2292,8 +2381,8 @@ msgstr ""
 "возможностью программирования), этот вариант связан с прерываниями работы "
 "центрального процессора, выберите его, если есть соответствующие установки."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2301,8 +2390,8 @@ msgstr ""
 "Выбор одного из пунктов приводит к внесению изменений в параметры по "
 "умолчанию, показанные в строке <guilabel>Параметры загрузки</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2312,26 +2401,27 @@ msgstr ""
 "в строке <guilabel>Параметры загрузки</guilabel>. Однако, эти параметры "
 "будут учтены при загрузке."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Дополнительные параметры работы ядра можно указать после нажатия клавиши F1 "
 "(только в устаревшем режиме)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2340,17 +2430,17 @@ msgstr ""
 "получить подробную справку, или нажмите клавишу Esc, чтобы вернуться к окну "
 "приветствия."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2363,24 +2453,24 @@ msgstr ""
 "параметров. Описанные в окне параметры можно добавить вручную в строку "
 "<guilabel>Параметры загрузки</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Посмотреть перевод справки на выбранном языке можно с помощью нажатия "
 "клавиши F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2390,17 +2480,23 @@ msgstr ""
 "можно найти  <link ns2:href=\"https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options\">здесь</link>."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Ниже приведено окно приветствия по умолчанию образа для установки по сети "
 "(названия - Boot.iso или Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2412,27 +2508,24 @@ msgstr ""
 "<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Вики Mageia</"
 "link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Раскладка клавиатуры соответствует американскому английскому."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Шаги установки"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2441,7 +2534,7 @@ msgstr ""
 "показан на боковой панели экрана."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2452,7 +2545,7 @@ msgstr ""
 "пользуются не так часто, как основными."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2462,7 +2555,7 @@ msgstr ""
 "относительно текущего шага."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2483,18 +2576,18 @@ msgstr ""
 "одновременно. После этого нажмите комбинацию клавиш <guibutton>Alt Ctrl "
 "Delete</guibutton> одновременно, чтобы перезагрузить компьютер."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблемы с установкой и возможные пути их решения"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Нет графического интерфейса"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2506,7 +2599,7 @@ msgstr ""
 "впишите <code>vgalo</code> в строку запроса."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2521,13 +2614,13 @@ msgstr ""
 "нажатием клавиши Enter. Введите <code>text</code>, увидев строку \"boot:\", "
 "и нажмите клавишу Enter. Установка будет продолжена в текстовом режиме."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Остановка установки"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2542,13 +2635,13 @@ msgstr ""
 "соответствующий режим, введите в строку запроса команду <code>noauto</code>. "
 "При необходимости эту команду можно совместить с вышеуказанными командами."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Проблемы с RAM (оперативной памятью)"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2562,13 +2655,13 @@ msgstr ""
 "оперативной памяти, например <code>mem=256M</code> соответствует 256 МБ "
 "оперативной памяти."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Динамические разделы"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4270,12 +4363,12 @@ msgstr ""
 "со способом переключения между латинской и нелатинской раскладкой."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Выберите, пожалуйста, язык"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4286,7 +4379,18 @@ msgstr ""
 "использовать этот выбор во время установки и в установленной системе."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Выберите нужный язык интерфейса системы. Для этого сначала откройте список "
+"стран вашего континента. <application>Mageia</application> будет "
+"использовать этот выбор во время установки и в установленной системе."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4299,10 +4403,11 @@ msgstr ""
 "сложно."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4312,7 +4417,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4323,7 +4428,7 @@ msgstr ""
 "язык будет отмечен и в окне выбора нескольких языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4333,12 +4438,12 @@ msgstr ""
 "связанные с выбранной раскладкой."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "По умолчанию Mageia использует поддержку UTF-8 (Юникод)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4349,7 +4454,7 @@ msgstr ""
 "всех установленных языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4404,20 +4509,20 @@ msgstr ""
 "шестью или более кнопками."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 "Добавление пункта в меню загрузки или внесение изменений в такие пункты"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 #, fuzzy
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
@@ -5189,6 +5294,54 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Вручную"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Safe Settings (безопасные параметры), преимущество параметров "
+#~ "безопасности над быстродействием."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
diff --git a/docs/installer/sk.po b/docs/installer/sk.po
index 664623a9..7374ea5f 100644
--- a/docs/installer/sk.po
+++ b/docs/installer/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2016-07-17 11:59+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1372,12 +1372,12 @@ msgstr ""
 "vašom výbere."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1389,7 +1389,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1402,7 +1402,7 @@ msgstr ""
 "literal> partíciu, inak váš systém nebude možné zaviesť."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1413,7 +1413,7 @@ msgstr ""
 "dokonca si prezrieť, čo je v nich, predtým ako začnete."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1422,7 +1422,7 @@ msgstr ""
 "je USB kľúč. Napríklad sda, sdb a sdc, ak sú pripojené tri kusy."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1431,28 +1431,32 @@ msgstr ""
 "partícií na vybranom úložnom zariadení."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Pre všetky ostatné akcie: kliknite najprv na požadovanú partíciu. Potom si "
 "ju prezrite, alebo si vyberte súborový systém a prípojný bod, zmeňte je "
 "veľkosť alebo ju prečistite."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Pokračujte dokým ste nenastavili všetko podľa vášho priania."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Kliknite na tlačidlo <guibutton>Hotovo</guibutton>, keď ste nachystaní."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 #, fuzzy
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
@@ -1462,52 +1466,53 @@ msgstr ""
 "Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 #, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Ak inštalujete Mageiu na UEFI systém, skontrolujte, či ESP (EFI Systémová "
 "Partícia) je prítomná a správne pripojená na /boot/EFI (viď vyššie)"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Rozdelenie diskov"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1518,7 +1523,7 @@ msgstr ""
 "nainštalovať <application>Mageiu</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1527,7 +1532,7 @@ msgstr ""
 "rozložení a obsahu vášho konkrétneho pevného disku."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1540,12 +1545,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Použiť existujúce partície"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1554,12 +1559,12 @@ msgstr ""
 "kompatibilné partície a môžu byť použité pre inštaláciu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Použiť voľné miesto"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1568,12 +1573,12 @@ msgstr ""
 "využije pre vašu novú inštaláciu Mageie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Použiť voľné miesto na Windowsovej partícii"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1582,7 +1587,7 @@ msgstr ""
 "môže ponúknuť jeho použitie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1593,7 +1598,7 @@ msgstr ""
 "zazálohované všetky dôležité súbory!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1609,7 +1614,7 @@ msgstr ""
 "použitá. Vysoko sa odporúča zazálohovať si vaše osobné súbory."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1623,37 +1628,37 @@ msgstr ""
 "nižšie."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Vymazať a použiť Celý Disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Táto možnosť použije celé diskové zariadenie pre Mageiu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Upozornenie! Toto vymaže VŠETKY dáta na vybranom pevnom disku. Teda buďte "
 "opatrní!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1663,12 +1668,13 @@ msgstr ""
 "disku, ktoré nie ste pripravení stratiť, potom nepoužívajte túto voľbu."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Vlastný výber"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Vlastné rozdelenie disku pomocou DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1677,19 +1683,20 @@ msgstr ""
 "disku (resp. diskoch)."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "Inštalátor rozdelí dostupné miesto podľa nasledovných pravidiel:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1698,31 +1705,31 @@ msgstr ""
 "partícia pre /, nebude tu žiadna samostatná partícia pre /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 "Ak je celkové dostupné miesto nad 50 GB, potom sa vytvoria tri partície"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 z celkového dostupného miesta je pridelených pre / ,nanajvýš však 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 je pridelená pre swap , nanajvýš však 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "zvyšok (prinajmenšom 12/19) je pridelený pre /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1731,12 +1738,13 @@ msgstr ""
 "tri partície: 50 GB pre /, 4 GB pre swap a zvyšok pre adresár /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Ak používate UEFI systém, ESP (EFI Systémová Partícia) bude automaticky "
 "rozpoznaná, alebo vytvorená, ak ešte neexistuje, a pripojená na /boot/EFI. "
@@ -1744,30 +1752,29 @@ msgstr ""
 "bolo správne vykonané"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1777,7 +1784,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1797,17 +1804,17 @@ msgstr ""
 "nastavenia:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Zarovnať na\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Uvádzajúce voľné miesto (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1842,7 +1849,8 @@ msgstr "Oficiálna dokumentácia pre Mageiu"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1858,7 +1866,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1870,7 +1878,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1926,7 +1934,7 @@ msgstr "Gratulujeme"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1937,7 +1945,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1947,7 +1955,7 @@ msgstr ""
 "teraz je bezpečné vybrať inštalačné médium a reštartovať váš počítač."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1956,7 +1964,7 @@ msgstr ""
 "systémov vo vašom počítači (ak ich máte viac než jeden)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1965,12 +1973,12 @@ msgstr ""
 "vybraná a spustená vaša nainštalovaná Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Nech sa vám páči!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1979,6 +1987,92 @@ msgstr ""
 "Mageii"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Menenie veľkostí partícií:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Všeobecný</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formátovanie"
@@ -2054,12 +2148,12 @@ msgstr ""
 "pokračovanie."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, inštalátor Mageie"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2070,7 +2164,7 @@ msgstr ""
 "aktualizáciu čo najľahšou ako sa len dá."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2078,51 +2172,56 @@ msgstr ""
 "Počiatočná ponuková obrazovka má rôzne možnosti, každopádne predvolená "
 "spustí inštalátor, ktorý bude zvyčajne všetko, čo potrebujete."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Uvítacia inštalačná obrazovka"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Použitie zavádzača Mageie"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Tu sú predvolené uvítacie obrazovky, pri používaní DVD Mageia. Prvá je s "
 "obstarožným systémom a druhá s UEFI systémom:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "Na tejto prvej obrazovke je možné nastaviť niektoré osobné nastavenia:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2130,22 +2229,22 @@ msgstr ""
 "Jazyk (len pre inštaláciu, môže sa odlišovať od zvoleného systémového "
 "jazyka) stlačením klávesy F2 (len v obstarožnom režime)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Použite šípkové klávesy pre výber jazyka a stlačte klávesu Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2157,32 +2256,31 @@ msgstr ""
 "guilabel>, <guilabel>Pamäťový test</guilabel> a <guilabel>Nástroj na "
 "detekciu hardvéru</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Zmeňte rozlíšenie obrazovky stlačením klávesy F3 (len v obstarožnom režime)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2192,8 +2290,8 @@ msgstr ""
 "\">F6</emphasis> v obstarožnom režime alebo klávesy <emphasis role=\"bold"
 "\">e</emphasis> key v režime UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2203,22 +2301,13 @@ msgstr ""
 "možností. Ponuka vyvolaná cez F6 zobrazuje nový riadok nazvaný "
 "<guilabel>Zavádzacie možnosti</guilabel> a ponúkne štyri položky:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Predvolené, táto nemení nič v predvolených možnostiach."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Bezpečné nastavenia, priorita je daná k bezpečnejším možnostiam na úkor "
-"výkonnosti."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2226,8 +2315,8 @@ msgstr ""
 "- Žiadne ACPI (Pokročilé rozhrania konfigurácie a napájania), spravovanie "
 "napájania nie je brané do úvahy."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2235,8 +2324,8 @@ msgstr ""
 "- Žiaden lokálny APIC (lokálny pokročilý programovateľný ovládač prerušení), "
 "jedná sa o prerušenia CPU, vyberte túto možnosť, ak ste k tomu vyzvaní."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2244,8 +2333,8 @@ msgstr ""
 "Keď si vyberiete jednu z týchto položiek, ona modifikuje predvolené možnosti "
 "zobrazené v riadku <guilabel>Možnosti zavádzania systému</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2255,26 +2344,27 @@ msgstr ""
 "F6 neobjavujú v riadku <guilabel>Možností zavádzania o.s.</guilabel>, avšak "
 "v skutočnosti sú brané do úvahy."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Pridajte viacero možností kernelu stlačením klávesy F1 (len v obstarožnom "
 "režime)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2282,17 +2372,17 @@ msgstr ""
 "so šípkovými klávesami a stlačte Enter pre obdržanie viacej detailov alebo "
 "stlačte klávesu Esc pre pre návrat na uvítaciu obrazovku."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2304,22 +2394,22 @@ msgstr ""
 "zoznamu možností. Tieto možnosti môžu byť pridané ručne v riadku "
 "<guilabel>Možnosti zavedenia</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Nápoveda je preložená vo zvolenom jazyku s klávesou F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2330,17 +2420,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Tu je predvolená uvítacia obrazovka pri používaní inštalačného CD založeného "
 "na pripojení k sieti (obrazy Boot.iso alebo Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2352,27 +2448,24 @@ msgstr ""
 "sieti, pozrite <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
 "\">Mageia Wiki</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Rozloženie klávesnice je americké."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Kroky inštalácie"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2381,7 +2474,7 @@ msgstr ""
 "na bočnom paneli obrazovky."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2391,7 +2484,7 @@ msgstr ""
 "možnosťami."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2400,7 +2493,7 @@ msgstr ""
 "bližšie vysvetlenia o aktuálnom kroku."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2420,18 +2513,18 @@ msgstr ""
 "stlačením troch kláves <guibutton>Alt Ctrl F2</guibutton>. Potom stlačte "
 "súčasne <guibutton>Alt Ctrl Delete</guibutton> pre reštart."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problémy pri inštalácií a možné riešenia"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Žiadne grafické rozhranie"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2442,7 +2535,7 @@ msgstr ""
 "nízke rozlíšenie obrazovky napísaním <code>vgalo</code> v príkazovom riadku."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2456,13 +2549,13 @@ msgstr ""
 "ponúknutá čierna obrazovka so slovom \"boot\". Napíšte \"text\" a stlačte "
 "ENTER. Teraz pokračujte s inštaláciou v textovom režime."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Inštalácia zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2476,13 +2569,13 @@ msgstr ""
 "príkazovom riadku. Táto možnosť môže byť tiež skombinovaná aj s inými "
 "možnosťami, ak je treba."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Problém s RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2494,13 +2587,13 @@ msgstr ""
 "parameter <code>mem=xxxM</code>, kde xxx je správne množstvo pamäte RAM, "
 "napr. <code>mem=256M</code> by znamenala 256MB RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamické partície"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4168,12 +4261,12 @@ msgstr ""
 "a nelatinským rozložením klávesnice."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Prosím, zvoľte jazyk, ktorý chcete používať"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4184,7 +4277,18 @@ msgstr ""
 "inštalácie a pre váš inštalovaný systém."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Vyberte si váš obľúbený jazyk, tým že najprv rozbalíte zoznam pre váš "
+"svetadiel. <application>Mageia</application> použije tento výber počas "
+"inštalácie a pre váš inštalovaný systém."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4197,10 +4301,11 @@ msgstr ""
 "náročné pridať extra jazykovú podporu po inštalácií."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4210,7 +4315,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4221,7 +4326,7 @@ msgstr ""
 "tiež označený ako vybraný na obrazovke viacerých jazykov."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4230,12 +4335,12 @@ msgstr ""
 "odporúča nainštalovať takisto jazyk vašej klávesnice."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia používa predvolene UTF-8 (Unicode) podporu."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4246,7 +4351,7 @@ msgstr ""
 "jazyky."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4300,19 +4405,19 @@ msgstr ""
 "šesť alebo viac tlačidiel."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Pridanie alebo úprava položiek Ponuky na zavedenie systému"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 #, fuzzy
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
@@ -5074,6 +5179,54 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Vlastný výber"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Bezpečné nastavenia, priorita je daná k bezpečnejším možnostiam na úkor "
+#~ "výkonnosti."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr ""
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 9662b9ff..09bf9e15 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-04-29 17:13+0000\n"
 "Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
 "Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1167,12 +1167,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Razdeljevanje diska po meri s programom DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1183,7 +1183,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1192,7 +1192,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1200,79 +1200,92 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klikni <guibutton>Končano</guibutton> ko bo v redu."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Razdelitev diska"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1280,14 +1293,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1296,43 +1309,43 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Uporabi obstoječe razdelke"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Uporabi razpoložljivi prostor"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Uporabi razpoložljivi prostor v razdelku za Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1340,7 +1353,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1351,7 +1364,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1360,31 +1373,35 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
+"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Zbriši in uporabi celoten disk."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ta možnost bo uporabila celoten pogon za Magejo."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "Pozor! To bo pobrisalo VSE podatke na izbrani napravi. Pazljivo!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1392,12 +1409,13 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Po meri"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Razdeljevanje diska po meri s programom DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1405,19 +1423,20 @@ msgstr ""
 "S tem imate popoln nadzor nad namestitvijo na (enem ali več) vaših diskov."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Velikost razdelkov:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "Namestitev bo razdelila razpoložljiv prostor po naslednjih pravilih:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1427,7 +1446,7 @@ msgstr ""
 "home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1435,23 +1454,23 @@ msgstr ""
 "trije razdelki"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr "6/19 prostora na voljo bo namenjeno korenskemu: /, a ne več kot 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 bo rezervirana izmenjalnemu razdelku: swap, a največ 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "ostalih (vsaj 12/19) bo uporabljenih za domači razdelek: /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1461,35 +1480,39 @@ msgstr ""
 "preostalo za domačo mapo: /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1498,7 +1521,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1510,17 +1533,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "»Poravnaj z ang.: Align to« »MiB«"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1553,7 +1576,8 @@ msgstr "Uradna dokumentacija za Magejo"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1569,7 +1593,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1581,7 +1605,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1636,7 +1660,7 @@ msgstr "Čestitke"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1645,7 +1669,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1653,32 +1677,118 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Uživajte"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
 msgstr ""
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Velikost razdelkov:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Običajen</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatiranje"
@@ -1740,12 +1850,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, namestitveni program Mageje"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1753,76 +1863,79 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr ""
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Prikaz dobrodošlice namestitve"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Odstrani Magejo"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1830,59 +1943,51 @@ msgid ""
 "Tool</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
 "emphasis> key for the UEFI mode."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -1890,61 +1995,61 @@ msgstr ""
 "- Brez ACPI (vmesnik za napredne nastavitve in upravljanje z energijo) "
 "upravljanje z energijo ni upoštevano"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -1952,37 +2057,42 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -1990,48 +2100,45 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Postavitev tipkovnice je sedaj Ameriška"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Namestitveni koraki"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
 msgstr ""
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2043,18 +2150,18 @@ msgid ""
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
 msgstr ""
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Težave z namestitvijo in možne rešitve"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Brez grafičnega vmesnika"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2062,7 +2169,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2071,13 +2178,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Namestitev zamrzne"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2086,13 +2193,13 @@ msgid ""
 "other options as necessary."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Težave s spominom RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2100,13 +2207,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dinamični razdelki"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3492,12 +3599,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Izberite jezik namestitve"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3505,7 +3612,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3514,10 +3628,11 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -3527,7 +3642,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3535,19 +3650,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3555,7 +3670,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3601,19 +3716,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4260,5 +4375,34 @@ msgid ""
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
 
+#~ msgid "Custom"
+#~ msgstr "Po meri"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
 #~ msgid "DVD"
 #~ msgstr "DVD"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index 63420717..04198394 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-01-27 01:30+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1350,12 +1350,12 @@ msgstr ""
 "konservatore në zgjedhjen tuaj."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Ndrysho shpërndarjet e diskut me DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
@@ -1367,7 +1367,7 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1380,7 +1380,7 @@ msgstr ""
 "literal> NUK duhet të vendoset, përndryshe sistemi juaj nuk do to ndizet."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1388,14 +1388,14 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1404,76 +1404,81 @@ msgstr ""
 "particionet në pajisjen e zgjedhura ruajtëse"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Për të gjitha veprimet e tjera: klikoni mbi ndarjen e dëshiruar të parë. "
 "Pastaj vështro atë, ose zgjidhni një dokumentacion-sistemi dhe një pikë "
 "montimi, ndrysho atë apo fshij atë."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Vazhdoni derisa ju të keni rregulluar gjithçka për dëshirat tuaja."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Kliko<guibutton>e Bërë</guibutton> kur ju jeni gati."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
 msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Shpërndarja"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1481,7 +1486,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1490,7 +1495,7 @@ msgstr ""
 "veçantë hard disku(t) paraqitjen dhe përmbajtjen."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1503,12 +1508,12 @@ msgstr ""
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Përdor ndarjet ekzistuese"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1517,12 +1522,12 @@ msgstr ""
 "përputhje janë gjetur dhe mund të përdoren për instalimin."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Përdor Hapësirën e Lirë"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1531,12 +1536,12 @@ msgstr ""
 "të përdorë atë për instalimin tuaj të ri Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Përdore Hapësirën e Lirë në Ndarjen Windows"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1545,7 +1550,7 @@ msgstr ""
 "instaluesi mund të ofrojë ta përdorni atë."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1556,7 +1561,7 @@ msgstr ""
 "jeni të sigurte që ju keni ruajtur rezervë gjitha dosjet e rëndësishme!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1573,7 +1578,7 @@ msgstr ""
 "e rekomanduar për të ruajtur dosjet tuaja personale rezervë."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1582,37 +1587,37 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Fshi dhe të përdor të Gjithë Diskun."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Ky opsion do të përdorin të gjithë diskun për Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Shënim! Kjo do të fshijë të gjitha të dhënat në hard diskun e zgjedhur. "
 "Kujdes!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1623,12 +1628,13 @@ msgstr ""
 "atëherë mos e përdorni këtë opsion."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Personalizuar"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Ndrysho shpërndarjet e diskut me DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1637,12 +1643,13 @@ msgstr ""
 "tuaja."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1651,7 +1658,7 @@ msgstr ""
 "mëposhtme:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1660,7 +1667,7 @@ msgstr ""
 "ndarje është krijuar për /, nuk ka ndarje të veçantë për /shtëpi."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
@@ -1668,7 +1675,7 @@ msgstr ""
 "krijuar"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1676,17 +1683,17 @@ msgstr ""
 "prej 50 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 është ndarë për swap me një maksimum prej 4GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "pjesa tjetër (të paktën 12/19) është e ndarë për /shtëpi"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1696,12 +1703,13 @@ msgstr ""
 "shtëpi."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Nëse jeni duke përdorur një sistem UEFI, ESP (EFI Sistemi Ndarja) do të "
 "zbulohet automatikisht, ose krijohet në qoftë se nuk ekziston ende, dhe "
@@ -1709,30 +1717,29 @@ msgstr ""
 "kontrolluar se është bërë në mënyrë korrekte"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
 "fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
@@ -1742,7 +1749,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1754,17 +1761,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Radhit në\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Liro hapësirën mësipër (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1799,7 +1806,8 @@ msgstr "Dokumentacioni zyrtar për Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1812,7 +1820,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1824,7 +1832,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1880,7 +1888,7 @@ msgstr "Urime"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 #, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
@@ -1891,7 +1899,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1902,7 +1910,7 @@ msgstr ""
 "të rifilloni kompjuterin tuaj."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1911,7 +1919,7 @@ msgstr ""
 "sistemeve operative në kompjuterin tuaj (nëse keni më shumë se një)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1920,12 +1928,12 @@ msgstr ""
 "juaj Mageia do të përzgjidhet automatikisht dhe filloi."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Kënaquni!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1934,6 +1942,92 @@ msgstr ""
 "në Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Përmasa ndarëseve:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Përgjithshëm</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Ndarjet"
@@ -2008,12 +2102,12 @@ msgstr ""
 "guibutton> për të vazhduar."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, instaluesi Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2024,7 +2118,7 @@ msgstr ""
 "më lehtë të jetë e mundur."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2033,53 +2127,58 @@ msgstr ""
 "të fillojë instaluesin, i cili normalisht do të jetë gjithçka që ju do të "
 "keni nevojë."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Pamja Fillestare Instalimit"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Ç'instalim Mageia "
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Këtu janë ekranet e mirëpritjes të parazgjedhur kur përdorni një DVD Mageia, "
 "i pari me me një sistem trashëgimi dhe i dyti me një sistem UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Nga ky ekran i parë, është e mundur për të vendosur disa nga preferencat "
 "personale:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2087,23 +2186,23 @@ msgstr ""
 "Gjuha (për instalimin e vetëm, mund të jet e ndryshme nga gjuha e zgjedhur "
 "për sistemin), duke shtypur butonin F2 (Vetëm mënyra trashegimi)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Përdorni butonat shigjetë për të zgjedhur gjuhën dhe shtypni butonin Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2115,33 +2214,32 @@ msgstr ""
 "Shpëtimit</guilabel>, <guilabel>Test memorie</guilabel> dhe <guilabel>Vegël "
 "Zbulimi Pjesësh</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Ndrysho rezolucionin e ekranit duke shtypur butonin F3 (Metodë Trashëgimia "
 "vetëm)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2151,8 +2249,8 @@ msgstr ""
 "emphasis> për mënyren trashegimi ose butonin <emphasis role=\"bold\">e</"
 "emphasis> për mënyren UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2163,84 +2261,75 @@ msgstr ""
 "linjë e thirrut <guilabel>Opsione ndezëse</guilabel> the propozon katër "
 "hyrje:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Parazgjedhur, kjo nuk ndryshon asgjë në opsionet e parazgjedhur."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Parametra Sigurta, prioritet i është dhënë opsioneve më të sigurta në dëm "
-"të përformancës."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Shtoni disa opsione kernel duke shtypur butonin F1 (Metodë trashëgimia "
 "vetëm)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2248,37 +2337,42 @@ msgid ""
 "line."
 msgstr ""
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Ndihma është përkthyer në gjuhën e zgjedhur me butonin F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
 "\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2286,27 +2380,24 @@ msgid ""
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr ""
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Hapat e instalimit"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2315,7 +2406,7 @@ msgstr ""
 "ndiqen në panelin anësor të ekranit."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2325,7 +2416,7 @@ msgstr ""
 "opsionet."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2334,7 +2425,7 @@ msgstr ""
 "shpjegime të mëtejshme në lidhje me hapin e tanishëm."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2356,18 +2447,18 @@ msgstr ""
 "shtypni, <guibutton>Ctrl Alt Delete</guibutton> të njëjtën kohë për të "
 "rifilluar."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Problemet e Instalimit dhe Zgjidhje e Mundshme"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Nuk ka Ndërfaqe Grafike"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2378,7 +2469,7 @@ msgstr ""
 "përdorni rezolutë të ulët duke shtypur <code>vgalo</code> në komandë."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2387,13 +2478,13 @@ msgid ""
 "ENTER. Now continue with the installation in text mode."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Instaluesi Ngrin"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2407,13 +2498,13 @@ msgstr ""
 "këtë, shkruaj <code>noauto</code> në ekran. Ky opsion mund të kombinohet me "
 "opsione të tjera të nevojshme."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Probleme RAM"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2421,13 +2512,13 @@ msgid ""
 "g. <code>mem=256M</code> would specify 256MB of RAM."
 msgstr ""
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Ndarjet dinamike"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3834,12 +3925,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Ju lutemi zgjidhni një gjuhë për të përdorur"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3850,7 +3941,18 @@ msgstr ""
 "përzgjedhje gjatë instalimit dhe për të instaluar sistemin tuaj."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Zgjidhni gjuhën tuaj të preferuar, duke parë zgjerimin e listës për "
+"kontinentit tuaj. <application>Mageia</application> do të përdorë këtë "
+"përzgjedhje gjatë instalimit dhe për të instaluar sistemin tuaj."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3863,16 +3965,20 @@ msgstr ""
 "jetë e vështirë për të shtuar mbështetje gjuhëve shtesë pas instalimit."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3880,19 +3986,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3900,7 +4006,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3946,19 +4052,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4626,6 +4732,54 @@ msgstr ""
 
 #, fuzzy
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png"
+#~ "\" align=\"center\"/> </imageobject> <imageobject condition='live' > "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Personalizuar"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Parametra Sigurta, prioritet i është dhënë opsioneve më të sigurta në "
+#~ "dëm të përformancës."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#, fuzzy
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index de91ffcb..568073d1 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-02-23 09:57+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1356,12 +1356,12 @@ msgstr ""
 "gång så är det klokt att vara försiktig med dina val."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Anpassad diskpartionering med DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1372,7 +1372,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1385,7 +1385,7 @@ msgstr ""
 "ställas in, annars kommer detta göra ditt system omöjligt att boota."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1396,7 +1396,7 @@ msgstr ""
 "dem innan du startar."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1406,7 +1406,7 @@ msgstr ""
 "stycken."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1415,26 +1415,30 @@ msgstr ""
 "den valda lagringsenheten"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "För alla andra åtgärder klickar du på den valda partitionen först. Välj "
 "filsystem och en monteringspunkt, ändra storlek eller radera den."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "Fortsätt tills du har justerat allt enligt dina önskemål."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Klicka på <guibutton>Klar</guibutton> när du är redo."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1443,51 +1447,53 @@ msgstr ""
 "systempartition) är närvarande och korrekt monterad på /boot/EFI (se nedan)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Om du installerar Mageia på ett Legacy/GPT-system, kontrollera så att det "
 "finns en BIOS boot-partition av korrekt typ."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Partitionering"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1498,7 +1504,7 @@ msgstr ""
 "application> kan installeras."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1507,7 +1513,7 @@ msgstr ""
 "layouten och innehållet på din(a) hårddisk(ar)."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 #, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
@@ -1520,12 +1526,12 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Använd existerande partitioner"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1534,12 +1540,12 @@ msgstr ""
 "hittats och kan användas för installation."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Använd ledigt utrymme"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1548,12 +1554,12 @@ msgstr ""
 "använda det för att installera Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Använd ledigt utrymme på en Windows-partition"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1562,7 +1568,7 @@ msgstr ""
 "dig möjlighet att använda det."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1573,7 +1579,7 @@ msgstr ""
 "har säkerhetskopierat alla viktiga filer!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1589,7 +1595,7 @@ msgstr ""
 "användas. Du rekommenderas starkt att säkerhetskopiera dina personliga filer."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1603,37 +1609,37 @@ msgstr ""
 "nedan."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Radera och använd hela hårddisken."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Det här alternativet kommer att använda hela disken för Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Tänk på att detta kommer att ta radera ALL data på den valda hårddisken. Var "
 "försiktig!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1644,12 +1650,13 @@ msgstr ""
 "ska du inte använda detta alternativ."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Anpassad"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Anpassad diskpartionering med DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1658,12 +1665,13 @@ msgstr ""
 "a disk/ar."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Partitionsstorlek:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1672,7 +1680,7 @@ msgstr ""
 "följande regler:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1681,31 +1689,31 @@ msgstr ""
 "att skapas för /. Det finns ingen separat partition för /home."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 "Om det totala utrymmet är mer än 50GB så kommer tre partitioner att skapas"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 av det totala lediga utrymmet fördelas till / med ett maximum av 50GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 är allokerat till swap med en gräns på 4 GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "resten (minst 12/19) förledas till /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1715,12 +1723,13 @@ msgstr ""
 "och resten till /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Om du har ett EFI-system kommer ESP (EFI Systempartition) att kännas igen "
 "automatiskt eller skapas om den inte finns, samt monteras på /boot/EFI. Det "
@@ -1728,13 +1737,14 @@ msgstr ""
 "utförts korrekt"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Om du använder ett äldre Legacy-system (även kallat CSM eller BIOS) med en "
 "GPT sisk så måste du skapa en boot-partition om det inte redan finns en. Den "
@@ -1743,20 +1753,19 @@ msgstr ""
 "som med vilken annan partition. Välj BIOS boot- partition som filsystem."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
 #, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1765,7 +1774,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1784,17 +1793,17 @@ msgstr ""
 "följande inställningar:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"Rikta mot\" \"MiB\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Ledigt utrymme före (MiB)\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1828,7 +1837,8 @@ msgstr "Mageias officiella dokumentation"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1844,7 +1854,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1856,7 +1866,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1912,7 +1922,7 @@ msgstr "Grattis"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1921,7 +1931,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1932,7 +1942,7 @@ msgstr ""
 "din dator."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1941,7 +1951,7 @@ msgstr ""
 "har mer än ett) i starthanteraren."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1950,12 +1960,12 @@ msgstr ""
 "väljas och starta automatiskt."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Njut!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1964,6 +1974,92 @@ msgstr ""
 "Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Partitionsstorlek:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Standard</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Formatering"
@@ -2038,12 +2134,12 @@ msgstr ""
 "fortsätta."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageias installerare"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2054,7 +2150,7 @@ msgstr ""
 "enkel som möjligt."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2062,53 +2158,58 @@ msgstr ""
 "Den första menyn har olika alternativ och det förvalda kommer att starta "
 "installationsprogrammet som i normalfallet är allt du behöver."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Välkomstskärm för installationen"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Använder en startshanterare från Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Här är några standard välkomstskärmar när man använder Mageias DVD. Den "
 "första för ett legacy-system och den andra för UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr ""
 "Från denna förstasida är det möjligt att ställa in några personliga "
 "inställningar."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2116,22 +2217,22 @@ msgstr ""
 "Språk (endast för installation, det kan vara annorlunda än det valda språket "
 "för systemet) genom att trycka på F2 (endast legacy-läge)"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Använd piltangenterna för att välja språk och tryck på Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2143,31 +2244,30 @@ msgstr ""
 "System</guilabel>, <guilabel>Memory Test</guilabel> och <guilabel>Hardware "
 "Detection Tool</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "Ändra skärmupplösning genom att trycka på F3 (endast legacy-läge)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2177,8 +2277,8 @@ msgstr ""
 "emphasis> i legacy-läge, eller <emphasis role=\"bold\">e</emphasis> för UEFI-"
 "läge."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2189,22 +2289,13 @@ msgstr ""
 "visar en ny rad kallad <guilabel>Boot options</guilabel> och föreslå fyra "
 "poster:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Standard, det ändrar inget i standardalternativen."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Säkra inställningar, prioritet ges till de mer säkra alternativen på "
-"bekostnad av prestanda."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2212,8 +2303,8 @@ msgstr ""
 "- Ingen ACPI (Advanced Configuration and Power Interface), strömhantering "
 "beaktas."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2221,8 +2312,8 @@ msgstr ""
 "- Ingen lokal APIC (Local Advanced Programmable Interrupt Controller), det "
 "handlar om CPU-avbrott, välj detta alternativ om du blir tillfrågad."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2230,8 +2321,8 @@ msgstr ""
 "När du väljer någon av dessa poster kommer det att ändra "
 "standardalternativen som visas på <guilabel>Boot Options</guilabel>-raden."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2241,25 +2332,26 @@ msgstr ""
 "F6 inte visas på raden <guilabel>Boot Options</guilabel>, men de beaktas "
 "dock ändå."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Lägg till fler kernel-alternativ genom att trycka på F1 (endast legacy-läge)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2267,17 +2359,17 @@ msgstr ""
 "något med piltangenterna och tryck på Enter för att få fler detaljer, "
 "alternativt kan du trycka på Escape för att gå tillbaka till välkomstskärmen."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2289,22 +2381,22 @@ msgstr ""
 "listan med alternativ. Dessa alternativ kan läggas till för hand på raden "
 "med <guilabel>Boot Options</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Hjälpen är översatt i det valda språket med tangenten F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2314,17 +2406,23 @@ msgstr ""
 "ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://"
 "wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Här är det välkomstmeddelande som är standard vid användning av en trådburen "
 "nätverksbaserad installations-CD (Boot.iso eller Boot-Nonfree.iso)."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2336,27 +2434,24 @@ msgstr ""
 "nätverksbaserad installations-CD, se <link ns2:href=\"https://wiki.mageia."
 "org/en/Boot.iso_install\">Mageias Wiki</link>"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Tangentbordslayouten är amerikansk."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Installationsstegen"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2365,7 +2460,7 @@ msgstr ""
 "sidopanelen på skärmen."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2374,7 +2469,7 @@ msgstr ""
 "guibutton>-knappar med mer, men sällan krävande alternativ."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2383,7 +2478,7 @@ msgstr ""
 "information om det aktuella steget."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2404,18 +2499,18 @@ msgstr ""
 "trycker du på <guibutton>Ctrl Alt Del</guibutton> samtidigt för att starta "
 "om."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Installationsproblem och möjliga lösningar"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Inget grafiskt gränssnitt"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2426,7 +2521,7 @@ msgstr ""
 "skriva <code>vgalo</code> vid prompten."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2441,13 +2536,13 @@ msgstr ""
 "\"Boot:\" Skriv \"text\" på den raden och tryck på Enter. Nu forsätter "
 "installationen i textläge."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Installationen hänger sig"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2461,13 +2556,13 @@ msgstr ""
 "skriv <code>noauto</code> vid prompten. Detta kan även kombineras med andra "
 "alternativ om nödvändigt."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM-problem"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2479,13 +2574,13 @@ msgstr ""
 "parameterna <code>mem=xxxM</code>, där xxx är den korrekta mängden RAM. T. "
 "ex. <code>mem=256M</code> anger 256MB RAM."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dynamiska partitioner"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4104,12 +4199,12 @@ msgstr ""
 "icke-latinsk tangentbordslayout"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Välj språk"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4120,7 +4215,18 @@ msgstr ""
 "valet under installationen och till ditt installerade system."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Välj det språk du vill använda genom att först expandera listan för din "
+"kontinent. <application>Mageia</application> kommer att använda det här "
+"valet under installationen och till ditt installerade system."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4133,10 +4239,11 @@ msgstr ""
 "språkstöd efter installationen."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4146,7 +4253,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4157,7 +4264,7 @@ msgstr ""
 "rutan för flera språk."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4166,12 +4273,12 @@ msgstr ""
 "även installera språket för ditt tangetbord."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia använder UTF-8 (Unicode)-stöd som standard."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4182,7 +4289,7 @@ msgstr ""
 "installerade språk."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4236,19 +4343,19 @@ msgstr ""
 "knappar."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Lägg till eller ändra en post i bootmenyn"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4983,6 +5090,54 @@ msgstr ""
 "I nästa steg kopieras filerna till hårddisken. Det kan ta lite tid och du "
 "kommer att få en blank skärm i slutet vilket är normalt."
 
+#, fuzzy
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake."
+#~ "png\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
+#~ "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Anpassad"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Säkra inställningar, prioritet ges till de mer säkra alternativen på "
+#~ "bekostnad av prestanda."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
 #~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index 37c72330..d23ba4a6 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-28 23:32+0000\n"
 "Last-Translator: tarakbumba <tarakbumba@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -1373,12 +1373,12 @@ msgstr ""
 "akıllıca olur."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "DiskDrake ile kişisel disk bölümlendirme"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1389,7 +1389,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1402,7 +1402,7 @@ msgstr ""
 "işaretli OLMAMALIDIR; yoksa sisteminiz açılmayacaktır."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1414,7 +1414,7 @@ msgstr ""
 "görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1423,7 +1423,7 @@ msgstr ""
 "sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1432,27 +1432,31 @@ msgstr ""
 "Temizle</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Diğer eylemler için: öncelikle arzu ettiğiniz disk bölümüne tıklayın. Sonra "
 "onu görüntüleyin veya bir dosya sistemi ve bağlama noktası seçin, yeniden "
 "boyutlandırın veya silin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "İsteğiniz doğrultusunda her şeyi ayarlayana kadar devan edin."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr "Hazır olunca <guibutton>Bitti</guibutton>' yi tıklayın."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1462,50 +1466,54 @@ msgstr ""
 "olun (aşağıya bakın)"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Mageia' yı bin Eski/GPT sisteme kuruyorsanız doğru türde bir BIOS disk "
 "bölümünün mevcut olduğunu denetleyin"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Bölümlendirme"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1516,7 +1524,7 @@ msgstr ""
 "bulduğu çözümlere ulaşabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1525,7 +1533,7 @@ msgstr ""
 "bölümlendirme düzeni ve içeriğine bağlı olarak değişecektir."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1538,12 +1546,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Mevcut Disk Bölümü Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1552,12 +1560,12 @@ msgstr ""
 "bölümleri bulunmuştur ve yükleme için kullanılabilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Boş Alan Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1566,12 +1574,12 @@ msgstr ""
 "bu seçenek o alanı kullanacaktır."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Windows Bölümündeki Boş Alan Kullanılsın"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1580,7 +1588,7 @@ msgstr ""
 "kullanmayı önerebilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1590,7 +1598,7 @@ msgstr ""
 "riskli bir işlem olduğundan önemli tüm dosyalarınızı yedeklemelisiniz!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1606,7 +1614,7 @@ msgstr ""
 "Kişisel dosyalarınızı yedeklemeniz önerilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1620,12 +1628,13 @@ msgstr ""
 "görüntüsüne bakın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1633,24 +1642,24 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Tüm Diski Sil ve Kullan"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "Bu seçenek tüm sabit diski Mageia için kullanacaktır."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Önemli! Bu işlem seçilen sabit diskteki BÜTÜN veriyi silecektir. Dikkatli "
 "olun!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1661,12 +1670,13 @@ msgstr ""
 "seçeneği kullanmayın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Özel"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "DiskDrake ile kişisel disk bölümlendirme"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1674,19 +1684,20 @@ msgstr ""
 "Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Disk bölümleri boyutlandırma:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "Aşağıdaki kurallara göre kurulum aracı erişilebilir alanı paylaşır:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1695,14 +1706,14 @@ msgstr ""
 "oluşturulur ve /home için ayrı bir disk bölümü oluşturulmaz."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr ""
 "Erişilebilir toplam boş alan 50 GB üzerindeyse, üç disk bölümü oluşturulur"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
@@ -1710,17 +1721,17 @@ msgstr ""
 "ayarlanır"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 kadarı en fazla 4 GB olacak şekilde takas olarak ayarlanır"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "kalanı (en az 12/19) ise /home olarak ayarlanır"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1730,12 +1741,13 @@ msgstr ""
 "home için arta kalan alan."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Bir UEFI sistem kullanıyorsanız ESP (EFI Sistem Bölümü) kendiliğinden "
 "algılanacak veya henüz mevcut değilse oluşturulacak ve /boot/EFI üzerine "
@@ -1743,13 +1755,14 @@ msgstr ""
 "sağlayan tek seçenektir."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "GPT disk ile bir Eski ( ayrıca CSM veya BIOS olarak da bilinir) sistem "
 "kullanıyorsanız, mevcut değilse bir Bios disk bölümü oluşturmalısınız. Bu, "
@@ -1759,12 +1772,12 @@ msgstr ""
 "önyükleme disk bölümünü seçin."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1772,7 +1785,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1781,7 +1794,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1800,17 +1813,17 @@ msgstr ""
 "öneririz. Şu ayarları kullanın: "
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "\"MIB\" \"için Hizala\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "\"Önündeki boş alan (MiB):\" \"2\""
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1845,7 +1858,8 @@ msgstr "Mageia Resmi Belgeleri"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1861,7 +1875,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1873,7 +1887,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1930,7 +1944,7 @@ msgstr "Tebrikler"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1939,7 +1953,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1950,7 +1964,7 @@ msgstr ""
 "başlatabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1959,7 +1973,7 @@ msgstr ""
 "fazla varsa) işletim sistemleri arasında seçim yapabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -1968,12 +1982,12 @@ msgstr ""
 "seçilecek ve başlatılacaktır."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Tadını çıkarın!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -1982,6 +1996,92 @@ msgstr ""
 "mageia.org adresini ziyaret edin"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Disk bölümleri boyutlandırma:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Genel</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Biçimlendirme"
@@ -2056,12 +2156,12 @@ msgstr ""
 "guibutton> düğmesini tıklayın."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, Mageia Kurulum Aracı"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2072,7 +2172,7 @@ msgstr ""
 "yapmanıza yardımcı olmak için tasarlanmıştır."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2080,51 +2180,56 @@ msgstr ""
 "İlk menü ekranı bir çok seçeneğe sahiptir; fakat öntanımlı olan, normalde "
 "tüm ihtiyacınızı karşılayacak, kurulum aracını başlatacaktır."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Kurulum Karşılama Ekranı"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "Bir Mageia önyükleyicisi kullanmak"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Burada bir Mageia DVD kullanıldığında öntanımlı karşılama ekranları "
 "bulunmaktadır. İlki eski sistemi ikincisi ise UEFI sistemi göstermektedir:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "İlk ekranda bazı kişisel seçenekler ayarlanabilir:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2133,22 +2238,22 @@ msgstr ""
 "olan ve sonradan bir başkasının sistem için ayarlanabileceği) dili "
 "seçebilirsiniz"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "Ok tuşlarını kullanarak dili seçin ve Enter tuşuna basın."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2160,32 +2265,31 @@ msgstr ""
 "<guilabel>Sistemi Kurtar</guilabel>, <guilabel>Bellek Sınaması</guilabel> ve "
 "<guilabel>Donanım Algılama Aracı</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "F3 (Sadece eski sistemlerde) tuşuna basarak ekran çözünürlüğünü değiştirin."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2195,8 +2299,8 @@ msgstr ""
 "tuşuna veya UEFI kipte <emphasis role=\"bold\">e</emphasis> tuşuna basarak "
 "ekleyebilirsiniz."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2206,22 +2310,13 @@ msgstr ""
 "denemeniz gerekebilir. F6 tuşu ile çağrılan menü <guilabel>Önyükleme "
 "seçenekleri</guilabel> adlı yeni bir satır görüntüler ve dört girdi önerir:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Öntanımlı, öntanımlı seçeneklerden hiçbirinde değişiklik yapmaz."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Güvenli Ayarlar, verimliliğin azalmasını önlemek için daha güvenli "
-"seçeneklere öncelik verilir."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2229,8 +2324,8 @@ msgstr ""
 "- ACPI (Gelişmiş Yapılandırma ve Güç Arabirimi) Yok, güç yönetimi hesaba "
 "alınmaz."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2238,8 +2333,8 @@ msgstr ""
 "- Yerel APIC (Yerel Gelişmiş Programlanabilir Kesme Denetleyicisi) Yok, bu "
 "seçenek işlemci kesmeleri ile ilgili olup sizden istendiğinde seçin."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2248,8 +2343,8 @@ msgstr ""
 "Seçenekleri</guilabel> satırında görüntülenen öntanımlı seçenekleri "
 "değiştirir."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2259,26 +2354,27 @@ msgstr ""
 "Seçenekleri</guilabel> satırında görüntülenmeyebilir; ancak aslında "
 "uygulanmaktadırlar."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "F1 tuşuna basarak daha fazla çekirdek seçeneği ekleyebilirsiniz (Sadece eski "
 "kipte)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2286,17 +2382,17 @@ msgstr ""
 "tuşları ile seçin ve Enter tuşuna basarak daha fazla bilgiye ulaşın veya Esc "
 "tuşuna basarak karşılama ekranına dönün."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2308,22 +2404,22 @@ msgstr ""
 "listesine dönün. Bu seçenekler <guilabel>Önyükleme seçenekleri</guilabel> "
 "satırına elle eklenebilir."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "Yardım, F2 tuşu ile seçilen dile çevrilmiştir."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2334,17 +2430,23 @@ msgstr ""
 "How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Kablolu Ağ-temelli Kurulum CDsi (Boot.iso veya Boot-Nonfree.iso imajları) "
 "kullanılırken görüntülenen öntanımlı karşılama ekranı budur:"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2356,27 +2458,24 @@ msgstr ""
 "daha fazla bilgi için <link ns2:href=\"https://wiki.mageia.org/en/Boot."
 "iso_install\">Mageia Wiki</link>sine bakın"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Klavye düzeni Amerikan düzenidir."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Kurulum adımları"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2385,7 +2484,7 @@ msgstr ""
 "bölünmüştür."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2394,7 +2493,7 @@ msgstr ""
 "düğmesini içerebilen bir veya bir kaç ekrana sahiptir."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2403,7 +2502,7 @@ msgstr ""
 "guibutton> düğmesine sahiptir."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2424,18 +2523,18 @@ msgstr ""
 "sonra yeniden başlatmak için <guibutton>Alt Ctrl Delete</guibutton> "
 "tuşlarına aynı anda basın."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Kurulum Sorunları ve Muhtemel Çözümleri"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Grafiksel Arabirim Yok"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2446,7 +2545,7 @@ msgstr ""
 "<code>vgalo</code> yazarak düşük çözünürlük kullanmayı deneyin."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2460,13 +2559,13 @@ msgstr ""
 "\" kelimesini içeren siyah bir ekranla karşılaşacaksınız. \"text\" yazın ve "
 "ENTER tuşuna basın. Şimdi kuruluma metin kipinde devam edin."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Kurulum Donuyor"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2480,13 +2579,13 @@ msgstr ""
 "satırında <code>noauto</code> yazın. Bu seçenek gerekli olduğunda diğer "
 "seçeneklerle birlikte kullanılabilir."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "RAM sorunu"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2498,13 +2597,13 @@ msgstr ""
 "parametresini kullanabilirsiniz. Buradaki xxx RAM' in doğru boyutunu ifade "
 "etmelidir. Mesela <code>mem=256M</code> 256MB RAM' i ifade eder."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Dinamik bölümler"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4144,12 +4243,12 @@ msgstr ""
 "istediğiniz sorulur."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Lütfen kullanacağınız dili seçiniz"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4160,7 +4259,18 @@ msgstr ""
 "sistemde bu seçimi kullanacaktır."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Bulunduğunuz kıtadaki listeyi genişleterek tercih ettiğiniz dili seçin. "
+"<application>Mageia</application> kurulum sırasında ve kurulumu tamamlanmış "
+"sistemde bu seçimi kullanacaktır."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4173,10 +4283,11 @@ msgstr ""
 "olacaktır."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4186,7 +4297,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4197,7 +4308,7 @@ msgstr ""
 "ekranında da işaretli olacaktır ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4206,12 +4317,12 @@ msgstr ""
 "dili de kurmanız önerilir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia, öntanımlı olarak UTF-8 (Unicode) desteğini kullanır."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4222,7 +4333,7 @@ msgstr ""
 "diller için de devre dışı bırakılmış olur."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4277,12 +4388,12 @@ msgstr ""
 "seçeneğini seçin."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Önyükleme Menü Girdisi Ekleme veya Değiştirme"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4291,7 +4402,7 @@ msgstr ""
 "Mageia veri kaynaklarında bulunan grub-customizer yazılımını kullanmalısınız."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5086,3 +5197,50 @@ msgstr ""
 "Bir sonraki adım, dosyaların sabit diske kopyalanmasıdır. Bu işlem biraz "
 "zaman alabilir. Sonunda, kısa süreliğine boş bir ekran ile "
 "karşılaşabilirsiniz fakat bu durum gayet olağandır."
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Özel"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Güvenli Ayarlar, verimliliğin azalmasını önlemek için daha güvenli "
+#~ "seçeneklere öncelik verilir."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 7843ceff..c8acd262 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-23 19:55+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -1408,12 +1408,12 @@ msgstr ""
 "автоматично. Знову ж таки, варто параметри варто вибирати дуже обережно."
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "Нетиповий поділ диска на розділи за допомогою DiskDrake"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1424,7 +1424,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1437,7 +1437,7 @@ msgstr ""
 "завантаження системи стане неможливим."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1449,7 +1449,7 @@ msgstr ""
 "розділів до внесення змін."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1459,7 +1459,7 @@ msgstr ""
 "виявлено три диски."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
@@ -1468,31 +1468,35 @@ msgstr ""
 "вибраному носії даних було вилучено."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "Щоб виконати будь-яку іншу дію, спочатку позначте область відповідного "
 "розділу. Потім перегляньте дані щодо розділу, змініть його файлову систему і "
 "точку монтування, розміри чи просто витріть увесь розділ."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr ""
 "Повторюйте ці дії для всіх відповідних розділів, аж доки все не набуде "
 "потрібних вам обрисів."
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr ""
 "Натисніть кнопку <guibutton>Виконано</guibutton>, коли налаштовування буде "
 "завершено."
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1501,50 +1505,54 @@ msgstr ""
 "(EFI System Partition) і що її змонтовано до /boot/EFI (див. нижче)."
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "Якщо ви встановлюєте Mageia на застарілій системі з GPT, переконайтеся, що "
 "існує розділ BIOS належного типу."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "Розбиття на розділи"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1555,7 +1563,7 @@ msgstr ""
 "щодо місця встановлення <application>Mageia</application>."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
@@ -1564,7 +1572,7 @@ msgstr ""
 "комп’ютера та вмісту дисків."
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1577,12 +1585,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "Користуватися існуючими розділами"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1591,12 +1599,12 @@ msgstr ""
 "Linux розділи, якими можна скористатися для встановлення системи."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "Використовувати вільний простір"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
@@ -1605,12 +1613,12 @@ msgstr ""
 "достатнє для встановлення нової системи Mageia."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "Використовувати вільний простір на розділі Microsoft Windows®"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
@@ -1620,7 +1628,7 @@ msgstr ""
 "системи."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1631,7 +1639,7 @@ msgstr ""
 "створити резервні копії важливих для вас файлів!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1649,7 +1657,7 @@ msgstr ""
 "вас файлів."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1663,12 +1671,13 @@ msgstr ""
 "нижче знімок екрана."
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1676,25 +1685,25 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "Стерти і використати весь диск"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr ""
 "У разі використання цього варіанта для встановлення Mageia буде використано "
 "весь об’єм на диску."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr ""
 "Зауваження: всіх дані на диску буде у такому разі витерто. Будьте обережні!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1704,12 +1713,13 @@ msgstr ""
 "не диску вже зберігаються якісь важливі дані, не користуйтеся цим варіантом."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "Спеціальний"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "Нетиповий поділ диска на розділи за допомогою DiskDrake"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
@@ -1718,12 +1728,13 @@ msgstr ""
 "розташування розділів на вашому диску відповідно до ваших уподобань."
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
@@ -1731,7 +1742,7 @@ msgstr ""
 "Засіб встановлення розподілити наявне місце відповідно до таких правил:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
@@ -1740,32 +1751,32 @@ msgstr ""
 "кореневий розділ, /, окремого розділу для /home створено не буде."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr "Якщо загалом доступного місця понад 50 ГБ, буде створено три розділи"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr ""
 "6/19 від доступного місця, але не більше за 50 ГБ, буде віддано розділу /"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr ""
 "1/19, але не більше за 4 ГБ, буде віддано розділу резервної пам’яті на диску "
 "(swap)"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "решту (принаймні 12/19) буде віддано розділу /home"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1775,12 +1786,13 @@ msgstr ""
 "пам’яті на диску. Решту місця буде віддано під /home."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "Якщо ви користуєтеся системою з UEFI, ESP (розділ із системою EFI) буде "
 "виявлено автоматично або створено, якщо його ще не існувало, і змонтовано "
@@ -1788,13 +1800,14 @@ msgstr ""
 "UEFI було виконано належним чином."
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "Якщо ви користуєтеся застарілою системою (відомою як CSM або BIOS) із диском "
 "GPT, вам доведеться створити розділ для завантаження BIOS, якщо його ще не "
@@ -1805,12 +1818,12 @@ msgstr ""
 "вибрати тип файлової системи «Розділ завантаження BIOS»."
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1818,7 +1831,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1827,7 +1840,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1847,17 +1860,17 @@ msgstr ""
 "таких значень параметрів:"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "«Вирівняти до» «МіБ»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "«Вільне місце перед (МіБ)» «2»"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr ""
@@ -1892,7 +1905,8 @@ msgstr "Офіційна документація до Mageia"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1908,7 +1922,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1920,7 +1934,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1977,7 +1991,7 @@ msgstr "Вітаємо"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1986,7 +2000,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1996,7 +2010,7 @@ msgstr ""
 "вилучати носій для встановлення системи і перезавантажувати ваш комп’ютер."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -2006,7 +2020,7 @@ msgstr ""
 "встановлено декілька систем)."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
@@ -2015,12 +2029,12 @@ msgstr ""
 "запущено встановлену вами операційну систему Mageia."
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Приємної роботи!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
@@ -2029,6 +2043,92 @@ msgstr ""
 "спільноті Mageia"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">Розміри розділів диска:</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>Загальний</emphasis>:"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Форматування"
@@ -2103,12 +2203,12 @@ msgstr ""
 "щоб продовжити роботу з програмою."
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX, програма для встановлення Mageia"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -2119,7 +2219,7 @@ msgstr ""
 "оновлення системи якомога простішим для вас."
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
@@ -2128,51 +2228,56 @@ msgstr ""
 "Типовим буде пункт запуску програми для встановлення системи. Зазвичай, це "
 "саме той пункт, який вам потрібен."
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "Вітальне вікно програми для встановлення"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "За допомогою Mageia"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "Нижче наведено типові вікна вітання DVD Mageia. Перше з них відповідає "
 "застарілій версії системи, друге — системі з UEFI:"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "За допомогою першої сторінки можна вказати деякі особисті уподобання:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
@@ -2180,24 +2285,24 @@ msgstr ""
 "Мову (лише на час встановлення, у системі може бути вибрано зовсім іншу "
 "мову) можна вибрати після натискання клавіші F2 (лише у застарілому режимі)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr ""
 "Скористайтеся клавішами зі стрілками, щоб вибрати потрібний вам пункт у "
 "списку, і натисніть клавішу Enter."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -2210,33 +2315,32 @@ msgstr ""
 "guilabel>, <guilabel>Тест пам’яті</guilabel> та <guilabel>Інструмент пошуку "
 "обладнання</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr ""
 "Змінити роздільну здатність екрана можна за допомогою натискання клавіші F3 "
 "(лише у застарілому режимі)."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2246,8 +2350,8 @@ msgstr ""
 "\">F6</emphasis> у режимі застарілої системи або клавіші <emphasis role="
 "\"bold\">E</emphasis> у режимі UEFI."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2259,22 +2363,13 @@ msgstr ""
 "показано новий пункт, <guilabel>Boot options</guilabel> (<guilabel>Параметри "
 "завантаження</guilabel>) з такими чотирма підпунктами:"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- Default (типовий), не змінювати нічого у типових параметрах."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr ""
-"- Safe Settings (безпечні параметри), перевага безпечності параметрів над "
-"швидкодією."
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
@@ -2282,8 +2377,8 @@ msgstr ""
 "- No ACPI (без розширеного інтерфейсу налаштовування та керування "
 "живленням), не брати до уваги параметри керування живленням."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2292,8 +2387,8 @@ msgstr ""
 "можливістю програмування), цей варіант пов’язано з перериваннями роботи "
 "центрального процесора, виберіть його, якщо маєте відповідні настанови."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2301,8 +2396,8 @@ msgstr ""
 "Вибір одного з пунктів призводить до внесення змін до типових параметрів, "
 "показаних у рядку <guilabel>Параметри завантаження</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2312,26 +2407,27 @@ msgstr ""
 "показано у рядку <guilabel>Параметри завантаження</guilabel>. Втім, ці "
 "параметри буде враховано під час завантаження системи."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr ""
 "Додаткові параметри роботи ядра можна вказати після натискання клавіші F1 "
 "(лише у застарілому режимі)."
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
@@ -2340,17 +2436,17 @@ msgstr ""
 "отримати докладнішу довідку, або натисніть клавішу Esc, щоб повернутися до "
 "вікна вітання."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2363,24 +2459,24 @@ msgstr ""
 "до списку параметрів. Описані у вікні параметри можна додати вручну до рядка "
 "<guilabel>Параметри завантаження</guilabel>."
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr ""
 "Переглянути переклад довідки вибраною мовою можна за допомогою натискання "
 "клавіші F2."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2390,17 +2486,23 @@ msgstr ""
 "можна знайти <link ns2:href=\"https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options\">тут</link>."
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "Нижче наведено типове вікно вітання образу для встановлення з мережі (назви "
 "— Boot.iso або Boot-Nonfree.iso):"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2412,27 +2514,24 @@ msgstr ""
 "<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">вікі Mageia</"
 "link>."
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "Розкладка клавіатури відповідає американській англійській."
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "Кроки встановлення"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
@@ -2441,7 +2540,7 @@ msgstr ""
 "показано на бічній панелі екрана."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2452,7 +2551,7 @@ msgstr ""
 "часто як основними."
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2462,7 +2561,7 @@ msgstr ""
 "поточного кроку."
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2483,18 +2582,18 @@ msgstr ""
 "Після цього, натисніть комбінацію клавіш <guibutton>Alt Ctrl Delete</"
 "guibutton> одночасно, щоб перезавантажити комп’ютер."
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "Проблеми зі встановленням та можливі шляхи їх вирішення"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "Немає графічного інтерфейсу"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2506,7 +2605,7 @@ msgstr ""
 "впишіть <code>vgalo</code> у рядок запиту."
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2521,13 +2620,13 @@ msgstr ""
 "натисканням клавіші Enter. Введіть <code>text</code> і натисніть клавішу "
 "Enter. Встановлення буде продовжено у текстовому режимі."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "Встановлення зупиняється"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2542,13 +2641,13 @@ msgstr ""
 "відповідний режим, введіть до рядка запиту команду <code>noauto</code>. За "
 "потреби, цю команду можна поєднати з вищевказаними командами."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "Проблеми з оперативною пам’яттю"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2562,13 +2661,13 @@ msgstr ""
 "об’єму оперативної пам’яті, наприклад <code>mem=256M</code> відповідає 256 "
 "МБ оперативної пам’яті."
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "Динамічні розділи"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -4253,12 +4352,12 @@ msgstr ""
 "способом перемикання між латинською і нелатинською розкладками."
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "Виберіть, будь ласка, мову"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -4270,7 +4369,19 @@ msgstr ""
 "встановленій системі."
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"Виберіть бажану мову інтерфейсу системи. Для цього спочатку розгорніть "
+"список країн вашого континенту. <application>Mageia</application> "
+"використовуватиме вибрану вами мову під час встановлення та у вже "
+"встановленій системі."
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -4282,10 +4393,11 @@ msgstr ""
 "додати їх. Після встановлення додати підтримку мов буде доволі складно."
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -4295,7 +4407,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -4306,7 +4418,7 @@ msgstr ""
 "мову буде позначено і у вікні вибору декількох мов."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
@@ -4316,12 +4428,12 @@ msgstr ""
 "мови, пов’язаної з вибраною розкладкою."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Типово, у Mageia використовується кодування UTF-8 (Unicode)."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -4332,7 +4444,7 @@ msgstr ""
 "стосуватиметься всіх встановлених мов."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -4387,12 +4499,12 @@ msgstr ""
 "більше кнопками."
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "Додавання пункту меню завантаження та внесення змін у такі пункти"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -4402,7 +4514,7 @@ msgstr ""
 "сховищ Mageia)."
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -5225,6 +5337,53 @@ msgstr ""
 "бачитимете порожній екран. Це нормально."
 
 #~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "Спеціальний"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr ""
+#~ "- Safe Settings (безпечні параметри), перевага безпечності параметрів над "
+#~ "швидкодією."
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+
+#~ msgid ""
 #~ "<imageobject> <imagedata fileref=\"dx2-setupBootloader5.png\"/> </"
 #~ "imageobject>"
 #~ msgstr ""
@@ -5687,9 +5846,6 @@ msgstr ""
 #~ "<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"/> "
 #~ "</imageobject>"
 
-#~ msgid "Using Mageia"
-#~ msgstr "За допомогою Mageia"
-
 #~ msgid "Using Windows"
 #~ msgstr "За допомогою Windows"
 
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index 108b83f9..1b04f846 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.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: 2017-05-23 19:45+0300\n"
+"POT-Creation-Date: 2017-06-25 19:47+0300\n"
 "PO-Revision-Date: 2017-05-21 06:29+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
@@ -1248,12 +1248,12 @@ msgstr ""
 "性。推荐保留此选项。"
 
 #. type: Content of: <section><info><title>
-#: en/diskdrake.xml:7
+#: en/diskdrake.xml:6
 msgid "Custom disk partitioning with DiskDrake"
 msgstr "使用 DiskDrake 自定义磁盘分区方式"
 
 #. type: Content of: <section><mediaobject>
-#: en/diskdrake.xml:12
+#: en/diskdrake.xml:10
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
@@ -1264,7 +1264,7 @@ msgstr ""
 "<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/diskdrake.xml:22
+#: en/diskdrake.xml:18
 msgid ""
 "If you wish to use encryption on your <literal>/</literal> partition you "
 "must ensure that you have a separate <literal>/boot</literal> partition. The "
@@ -1275,7 +1275,7 @@ msgstr ""
 "并且该分区不能被加密；否则，系统将无法启动。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:29
+#: en/diskdrake.xml:24
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
 "partitions, change the filesystem of a partition or change its size and even "
@@ -1285,7 +1285,7 @@ msgstr ""
 "时预览操作后的效果。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:34
+#: en/diskdrake.xml:28
 msgid ""
 "There is a tab for every detected hard disk or other storage device, like an "
 "USB key. For example sda, sdb and sdc if there are three of them."
@@ -1294,33 +1294,37 @@ msgstr ""
 "分别显示 sda、sdb、sdc 的磁盘布局。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:38
+#: en/diskdrake.xml:31
 msgid ""
 "Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
 "storage device"
 msgstr "点击 <guibutton>全部清除</guibutton> 可以删除所选设备上的全部分区。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:41
+#: en/diskdrake.xml:33
+#, fuzzy
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
-"or choose a filesystem and a mount point, resize it or wipe it."
+"or choose a filesystem and a mount point, resize it or wipe it. "
+"<guibutton>Toggle to expert mode</guibutton> (or <guibutton>Expert mode</"
+"guibutton>) gives some more tools like to add a label or to choose a "
+"partition type."
 msgstr ""
 "对于其他操作：请先点击要操作的分区；然后查看其详细信息，或选择文件系统和挂载"
 "点，改变其大小或擦除它。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:45
+#: en/diskdrake.xml:38
 msgid "Continue until you adjusted everything to your wishes."
 msgstr "请继续，直到所需操作完成。"
 
 #. type: Content of: <section><para>
-#: en/diskdrake.xml:48
+#: en/diskdrake.xml:40
 msgid "Click <guibutton>Done</guibutton> when you're ready."
 msgstr " 准备好时点击<guibutton>完成</guibutton>按钮。"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:52
+#: en/diskdrake.xml:43
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see below)"
@@ -1329,50 +1333,54 @@ msgstr ""
 "被挂载至 /boot/EFI（见下）"
 
 #. type: Content of: <section><note><para><mediaobject>
-#: en/diskdrake.xml:57
+#: en/diskdrake.xml:46
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
-"\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
-"<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-diskdrake2.png"
+"\" align=\"center\"/></imageobject><imageobject condition=\"live"
+"\"><imagedata align=\"center\" fileref=\"live-diskdrake2.png\"/></"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-diskdrake2.png"
 "\" align=\"center\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-diskdrake2.png\" align=\"center\"/> </imageobject>"
 
-#. type: Content of: <section><figure>
-#: en/diskdrake.xml:56 en/installer.xml:41
+#. type: Content of: <section><note><para>
+#: en/diskdrake.xml:46
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
 msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><note><para>
-#: en/diskdrake.xml:67
+#: en/diskdrake.xml:49
+#, fuzzy
 msgid ""
 "If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot "
-"partition is present with a correct type"
+"partition is present and of the correct type"
 msgstr ""
 "若您使用传统的硬件+GPT硬盘分区，请确保您设置了 BIOS 引导分区，并且为其指定了"
 "正确的分区标志"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/diskdrake.xml:71
+#: en/diskdrake.xml:51
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata align=\"center\" fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" align="
-"\"center\"/> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
-#: en/doPartitionDisks.xml:9
+#: en/doPartitionDisks.xml:7
 msgid "Partitioning"
 msgstr "分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:12
+#: en/doPartitionDisks.xml:9
 msgid ""
 "In this screen you can see the content of your hard drive(s) and see the "
 "solutions the DrakX partitioning wizard found for where to install "
@@ -1382,14 +1390,14 @@ msgstr ""
 "<application>Mageia</application> 的安装方法。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:17
+#: en/doPartitionDisks.xml:13
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
 msgstr "根据特定硬盘布局和内容的不同，下列选项可能会有所不同。"
 
 #. type: Content of: <section><mediaobject>
-#: en/doPartitionDisks.xml:22
+#: en/doPartitionDisks.xml:17
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1402,12 +1410,12 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:33
+#: en/doPartitionDisks.xml:24
 msgid "Use Existing Partitions"
 msgstr "使用现存的分区"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:36
+#: en/doPartitionDisks.xml:25
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
@@ -1416,31 +1424,31 @@ msgstr ""
 "安装。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:42
+#: en/doPartitionDisks.xml:27
 msgid "Use Free Space"
 msgstr "使用空闲空间"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:44
+#: en/doPartitionDisks.xml:27
 msgid ""
 "If you have unused space on your hard drive then this option will use it for "
 "your new Mageia installation."
 msgstr "若硬盘上有未使用的区域，此选项将会把 Mageia 安装到该区域中。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:50
+#: en/doPartitionDisks.xml:29
 msgid "Use Free Space on a Windows Partition"
 msgstr "使用 Windows 分区中的空闲空间"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:53
+#: en/doPartitionDisks.xml:30
 msgid ""
 "If you have unused space on an existing Windows partition, the installer may "
 "offer to use it."
 msgstr "若现存 Windows 分区中有空闲空间，安装程序将把 Mageia 安装在此处。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:57
+#: en/doPartitionDisks.xml:32
 msgid ""
 "This can be a useful way of making room for your new Mageia installation, "
 "but is a risky operation so you should make sure you have backed up all "
@@ -1450,7 +1458,7 @@ msgstr ""
 "所有重要文件！"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:62
+#: en/doPartitionDisks.xml:35
 msgid ""
 "Note that this involves shrinking the size of the Windows partition. The "
 "partition must be \"clean\", meaning that Windows must have closed down "
@@ -1464,7 +1472,7 @@ msgstr ""
 "移出待使用区域。我们推荐您对个人文件进行备份后再进行此操作。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:70
+#: en/doPartitionDisks.xml:41
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1476,12 +1484,13 @@ msgstr ""
 "图）。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
-#: en/doPartitionDisks.xml:77
+#: en/doPartitionDisks.xml:45
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks2.png\" align="
-"\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"><imagedata fileref=\"dx2-"
+"doPartitionDisks2.png\" align=\"center\"/></imageobject><imageobject "
+"condition=\"live\"><imagedata fileref=\"live-doPartitionDisks2.png\" align="
+"\"center\"/></imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks2.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1489,22 +1498,22 @@ msgstr ""
 "\"center\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:88
+#: en/doPartitionDisks.xml:45
 msgid "Erase and use Entire Disk."
 msgstr "擦除磁盘，并使用整个磁盘。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:91
+#: en/doPartitionDisks.xml:46
 msgid "This option will use the complete drive for Mageia."
 msgstr "此选项将会把整个硬盘空间用于安装 Mageia。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:94
+#: en/doPartitionDisks.xml:47
 msgid "Note! This will erase ALL data on the selected hard drive. Take care!"
 msgstr "注意！将会删除所选驱动器上的所有数据！请谨慎操作！"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:97
+#: en/doPartitionDisks.xml:48
 msgid ""
 "If you intend to use part of the disk for something else, or you already "
 "have data on the drive that you are not prepared to lose, then do not use "
@@ -1514,60 +1523,62 @@ msgstr ""
 "要使用此选项。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:104
-msgid "Custom"
-msgstr "自定义"
+#: en/doPartitionDisks.xml:51
+#, fuzzy
+msgid "Custom disk partitioning"
+msgstr "使用 DiskDrake 自定义磁盘分区方式"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:106
+#: en/doPartitionDisks.xml:52
 msgid ""
 "This gives you complete control over the placing of the installation on your "
 "hard drive(s)."
 msgstr "允许您完全控制系统在硬盘上的安装方式。"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:112
-msgid "<emphasis role=\"bold\">Partitions sizing:</emphasis>"
+#: en/doPartitionDisks.xml:55
+#, fuzzy
+msgid "<emphasis role=\"bold\">Partition sizing:</emphasis>"
 msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:114
+#: en/doPartitionDisks.xml:56
 msgid ""
 "The installer will share the available place out according to the following "
 "rules:"
 msgstr "安装程序将会根据下列规则使用可用空间："
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:119
+#: en/doPartitionDisks.xml:58
 msgid ""
 "If the total available place is lower than 50 GB, only one partition is "
 "created for /, there is no separate partition for /home."
 msgstr "若可用空间小于 50GB，则只创建 / 分区，不创建单独的 /home 分区。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:125
+#: en/doPartitionDisks.xml:60
 msgid ""
 "If the total available place is over 50 GB, then three partitions are created"
 msgstr "若总可用空间大于 50GB，则创建三个分区。"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:130
+#: en/doPartitionDisks.xml:61
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
 msgstr "其中 6/19 被分配给 / 分区，最大不超过 50GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:135
+#: en/doPartitionDisks.xml:62
 msgid "1/19 is allocated to swap with a maximum of 4 GB"
 msgstr "1/19 被分配给交换分区，最大不超过 4GB"
 
 #. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
-#: en/doPartitionDisks.xml:139
+#: en/doPartitionDisks.xml:62
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "剩余部分（至少 12/19）被分配给 /home 分区"
 
 #. type: Content of: <section><para>
-#: en/doPartitionDisks.xml:145
+#: en/doPartitionDisks.xml:63
 msgid ""
 "That means that from 160 GB and over of available place, the installer will "
 "create three partitions: 50 GB for /, 4 GB for swap and the rest for /home."
@@ -1576,36 +1587,38 @@ msgstr ""
 "及 106GB 的 /home 分区。"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:150
+#: en/doPartitionDisks.xml:67
+#, fuzzy
 msgid ""
 "If you are using an UEFI system, the ESP (EFI System Partition) will be "
 "automatically detected, or created if it does not exist yet, and mounted on /"
-"boot/EFI. The \"Custom\" option is the only one that allows to check it has "
-"been correctly done"
+"boot/EFI. The \"Custom disk partitioning\" option is the only one that "
+"allows to check it has been correctly done"
 msgstr ""
 "若您使用 UEFI 系统，将自动检测并创建 ESP（EFI 系统分区），之后将其挂载到 /"
 "boot/EFI。“自定义”选项仅用于检测该操作的结果是否正确"
 
 #. type: Content of: <section><note><para>
-#: en/doPartitionDisks.xml:157
+#: en/doPartitionDisks.xml:73
+#, fuzzy
 msgid ""
 "If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, "
 "you need to create a Bios boot partition if not already existing. It is an "
-"about 1 MiB partition with no mount point. Choose the \"Custom disk "
-"partitioning\" option to be able to create it with the Installer like any "
-"other partition, just select BIOS boot partition as filesystem type."
+"about 1 MiB partition with no mount point. Choose <xref linkend=\"diskdrake"
+"\"/> to be able to create it with the Installer like any other partition, "
+"just select BIOS boot partition as filesystem type."
 msgstr ""
 "若您使用传统的硬件（即 CSM  或 BIOS），并且使用 GPT 格式的硬盘分区，您需要先"
 "创建一个 BIOS 引导分区。该分区一般为 1 MiB 左右，且不会被挂载。请选择“自定义"
 "磁盘分区”，然后手动创建一个 BIOS 引导分区。"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:165
+#: en/doPartitionDisks.xml:79
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
-"doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-doPartitionDisks3.png\"/> </imageobject> <imageobject condition=\"live"
+"\"> <imagedata fileref=\"live-doPartitionDisks3.png\"/> </imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
@@ -1613,7 +1626,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><note><mediaobject>
-#: en/doPartitionDisks.xml:175
+#: en/doPartitionDisks.xml:87
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks4.png\"/> </"
 "imageobject>"
@@ -1622,7 +1635,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:182
+#: en/doPartitionDisks.xml:93
 msgid ""
 "Some newer drives are now using 4096 byte logical sectors, instead of the "
 "previous standard of 512 byte logical sectors. Due to lack of available "
@@ -1637,17 +1650,17 @@ msgstr ""
 "议您使用其他的分区工具（如gparted）预先进行分区操作："
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:190
+#: en/doPartitionDisks.xml:100
 msgid "\"Align to\" \"MiB\""
 msgstr "“对齐到”“MiB”"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:192
+#: en/doPartitionDisks.xml:101
 msgid "\"Free space preceding (MiB)\" \"2\""
 msgstr "“前面的自由空间（MiB）”“2”"
 
 #. type: Content of: <section><warning><para>
-#: en/doPartitionDisks.xml:194
+#: en/doPartitionDisks.xml:102
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
 msgstr "确保所有创建的分区的大小均为偶数倍 MB。"
@@ -1680,7 +1693,8 @@ msgstr "Mageia 的官方文档"
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1696,7 +1710,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:24 en/DrakLive.xml:15 en/DrakX-cover.xml:24
-#: en/DrakX.xml:16
+#: en/DrakX.xml:15
 msgid ""
 "This manual was produced with the help of the <link ns6:href=\"http://www."
 "calenco.com\">Calenco CMS</link> developed by <link ns6:href=\"http://www."
@@ -1707,7 +1721,7 @@ msgstr ""
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:26 en/DrakLive.xml:17 en/DrakX-cover.xml:26
-#: en/DrakX.xml:18
+#: en/DrakX.xml:17
 msgid ""
 "It was written by volunteers in their free time. Please contact <link ns6:"
 "href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
@@ -1761,7 +1775,7 @@ msgstr "恭喜"
 
 #.  Lebarhon 20170209 updated SC
 #. type: Content of: <section><mediaobject>
-#: en/exitInstall.xml:9
+#: en/exitInstall.xml:7
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" fileref=\"dx2-exitInstall.png\" "
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
@@ -1770,7 +1784,7 @@ msgstr ""
 "align=\"center\" revision=\"1\" xml:id=\"exitInstall-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:14
+#: en/exitInstall.xml:11
 msgid ""
 "You have finished installing and configuring <application>Mageia</"
 "application> and it is now safe to remove the installation medium and reboot "
@@ -1778,7 +1792,7 @@ msgid ""
 msgstr "您以完成安装和配置 Mageia，现在可以安全地移除安装介质并重新启动。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:18
+#: en/exitInstall.xml:14
 msgid ""
 "After reboot, in the bootloader screen, you can choose between the operating "
 "systems on your computer (if you have more than one)."
@@ -1787,25 +1801,111 @@ msgstr ""
 "统）。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:22
+#: en/exitInstall.xml:17
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
 msgstr "若您没有调整引导器的配置，将会自动启动 Mageia。"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:26
+#: en/exitInstall.xml:20
 msgid "Enjoy!"
 msgstr "Enjoy!"
 
 #. type: Content of: <section><para>
-#: en/exitInstall.xml:28
+#: en/exitInstall.xml:21
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
 msgstr "若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mageia.org。"
 
 #. type: Content of: <section><info><title>
+#: en/firewall.xml:3
+msgid "Firewall"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:6
+msgid ""
+"This section allows to configure some simple firewall rules: they determine "
+"which type of message from the Internet will be accepted by the target "
+"system. This, in turn, allows the corresponding services on the system to be "
+"accessible from the Internet."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:12
+msgid ""
+"In the default setting, no button is checked - no service of the system is "
+"accessibly from the network. The \"<emphasis>Everything (no firewall)</"
+"emphasis>\" button has a particular role: it enables access to all services "
+"of the machine - an option that does not make much sense in the context of "
+"the installer since it would create a totally unprotected system.  Its "
+"veritable use is in the context of the Mageia Control Center (which uses the "
+"same GUI layout) for temporarily disabling the entire set of firewall rules "
+"for testing and debugging purposes."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:21
+msgid ""
+"All other checkbuttons are more or less self-explanatory. As an example, you "
+"will check the \"CUPS server\" button if you want printers on your machine "
+"to be accessible from the network."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:25
+#, fuzzy
+msgid "<emphasis role=\"bold\">Advanced</emphasis>"
+msgstr "<emphasis role=\"bold\">分区大小：</emphasis>"
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:27
+msgid ""
+"The set of checkbuttons only comprises the most common services. The "
+"\"Advanced\" button allows to enable messages that correspond to a service "
+"for which no checkbutton exists. The \"<emphasis>Advanced</emphasis>\" "
+"button opens a window where you can enable a series of services by typing a "
+"list of couples (blank separated)"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:33
+#, fuzzy
+msgid "<emphasis>&lt;port-number>/&lt;protocol></emphasis>"
+msgstr "<emphasis>通用</emphasis>"
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:36
+msgid ""
+"- <emphasis>&lt;port-number></emphasis> is the value of the port assigned to "
+"the service you want to enable (e.g. 873 for the RSYNC service) as defined "
+"in <emphasis>RFC-433</emphasis>;"
+msgstr ""
+
+#. type: Content of: <section><simplelist><member>
+#: en/firewall.xml:40
+msgid ""
+"- <emphasis>&lt;protocol></emphasis> is one of <emphasis>TCP</emphasis> or "
+"<emphasis>UDP</emphasis> - the internet protocol that is used by the service."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:45
+msgid ""
+"For instance, the entry for enabling access to the RSYNC service therefore "
+"is <emphasis>873/tcp</emphasis>."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/firewall.xml:48
+msgid ""
+"In case a service is implemented to use both protocols, you specify 2 "
+"couples for the same port."
+msgstr ""
+
+#. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "格式化"
@@ -1873,12 +1973,12 @@ msgid ""
 msgstr "若您确定选项正确，请点击<guibutton>下一页</guibutton>继续。"
 
 #. type: Content of: <section><info><title>
-#: en/installer.xml:17
+#: en/installer.xml:3
 msgid "DrakX, the Mageia Installer"
 msgstr "DrakX，Mageia 的安装器"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:20
+#: en/installer.xml:7
 msgid ""
 "Whether you are new to GNU-Linux or an experienced user, the Mageia "
 "Installer is designed to help make your installation or upgrade as easy as "
@@ -1888,79 +1988,84 @@ msgstr ""
 "级系统。"
 
 #. type: Content of: <section><para>
-#: en/installer.xml:28
+#: en/installer.xml:11
 msgid ""
 "The initial menu screen has various options, however the default one will "
 "start the installer, which will normally be all that you will need."
 msgstr "初始页中有很多选项，安装器将会选择其中的默认项（一般是您所需的）。"
 
-#. type: Content of: <section><figure><info><title>
-#: en/installer.xml:34
+#. type: Content of: <section><section><title>
+#: en/installer.xml:16
 msgid "Installation Welcome Screen"
 msgstr "安装欢迎屏幕"
 
-#. type: Content of: <section><figure>
-#: en/installer.xml:33
-msgid "<placeholder type=\"info\" id=\"0\"/>"
-msgstr "<placeholder type=\"info\" id=\"0\"/>"
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:19
+#, fuzzy
+msgid "Using a Mageia DVD"
+msgstr "使用 Mageia 提供的引导器"
 
-#. type: Content of: <section><figure><para>
-#: en/installer.xml:37
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:21
+#, fuzzy
 msgid ""
 "Here are the default welcome screens when using a Mageia DVD, The first one "
-"with a legacy system and the second one with an UEFI system:"
+"with an UEFI system and the second one with a Legacy system:"
 msgstr ""
 "此处是使用 Mageia DVD 安装的默认欢迎屏幕：第一个是使用传统引导的系统，第二个"
 "是使用 UEFI 引导的系统。"
 
-#. type: Content of: <section><figure><mediaobject>
-#: en/installer.xml:42
-msgid ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:26
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome2.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:49
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:31
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
+"From this screen, you can access to options by pressing the \"e\" letter to "
+"enter the \"edit mode\". To come back to this screen, press either the key "
+"\"esc\" to quit without saving or press the key \"Ctrl\" or \"F10\" to quit "
+"with saving."
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
-"imageobject>"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:54
-msgid ""
-"From this first screen, it is possible to set some personal preferences:"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:37
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:42
+#, fuzzy
+msgid "From this screen, it is possible to set some personal preferences:"
 msgstr "在此页中，可以进行自定义设置："
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:59
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:45
 msgid ""
 "The language (for the installation only, may be different that the chosen "
 "language for the system) by pressing the key F2 (Legacy mode only)"
 msgstr ""
 "按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:66
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:50
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:71
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:55
 msgid "Use the arrow keys to select the language and press the key Enter."
 msgstr "使用方向键来选择语言，然后按 Enter 键。"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:74
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:58
 msgid ""
 "Here is for example, the French welcome screen when using a Live DVD/CD. "
 "Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
@@ -1971,31 +2076,30 @@ msgstr ""
 "包括：<guilabel>救援系统</guilabel>, <guilabel>内存测试</guilabel> and "
 "<guilabel>硬件检测工具</guilabel>。"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:82
-msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
-"imageobject>"
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:65
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:91
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:72
 msgid "Change the screen resolution by pressing the F3 key (Legacy mode only)."
 msgstr "按 F3 键可以更改屏幕分辨率（仅用于传统模式）。"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:95
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:76
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:102
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:83
 msgid ""
 "Add some kernel options by pressing the <emphasis role=\"bold\">F6</"
 "emphasis> key for the legacy mode or the <emphasis role=\"bold\">e</"
@@ -2004,8 +2108,8 @@ msgstr ""
 "按 <emphasis role=\"bold\">F6</emphasis> 键（传统模式下）或 <emphasis role="
 "\"bold\">e</emphasis> 键（UEFI 模式下）可以添加内核参数。"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:104
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:85
 msgid ""
 "If the installation fails, then it may be necessary to try again using one "
 "of the extra options. The menu called by F6 displays a new line called "
@@ -2014,27 +2118,20 @@ msgstr ""
 "若安装失败，您可能需要尝试其他的选项。按 F6 键可以调出 <guilabel>引导选项</"
 "guilabel>，这里提供了四个选项："
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:109
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:90 en/installer.xml:93
 msgid "- Default, it doesn't alter anything in the default options."
 msgstr "- 默认，即使用默认选项。"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:112
-msgid ""
-"- Safe Settings, priority is given to the safer options to the detriment of "
-"performances."
-msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
-
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:115
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:96
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
 msgstr "- 无 ACPI（高级配置与电源接口），不使用电源管理功能"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:118
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:99
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
@@ -2042,8 +2139,8 @@ msgstr ""
 "- 无本地 APIC（本地高级可编程终端控制器）。若您不需要控制 CPU 中断，可以选择"
 "此选项"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:122
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:103
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
@@ -2051,8 +2148,8 @@ msgstr ""
 "若选择了这些选项之一，将会同时更改<guilabel>引导选项</guilabel>行中的默认选"
 "项。"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:126
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:108
 msgid ""
 "In some Mageia releases, it may happen that the entries selected with the "
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
@@ -2061,41 +2158,42 @@ msgstr ""
 "在部分 Mageia 版本中，使用 F6 键选择的选项可能不会在<guilabel>引导选项</"
 "guilabel>中出现，但这并不影响选项发挥作用。"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:133
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:115
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
-"imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome6opt.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:140
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:122
 msgid "Add more kernel options by pressing the key F1 (Legacy mode only)."
 msgstr "按 F1 键可以添加更多内核参数（仅用于传统模式）。"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:143
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:125
+#, fuzzy
 msgid ""
-"Pressing F1 opens a new window with more available options. Select one with "
+"Pressing F1 opens a new window with more available options.  Select one with "
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
 "按 F1 可以打开包含更多选项的新窗口。使用方向键和 Enter 来查看更多细节，或按 "
 "Esc 来返回到欢迎屏幕。"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:150
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:131
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><para>
-#: en/installer.xml:157
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:136
 msgid ""
 "The detailed view about the option splash. Press Esc or select "
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
@@ -2105,22 +2203,22 @@ msgstr ""
 "有关 splash 选项的细节。按 Esc 或选择 <guilabel>返回引导选项</guilabel>可以回"
 "到选项列表。可以手动将这些选项添加到<guilabel>引导选项</guilabel> 行。"
 
-#. type: Content of: <section><itemizedlist><listitem><mediaobject>
-#: en/installer.xml:163
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><mediaobject>
+#: en/installer.xml:142
+#, fuzzy
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp2.png\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 
-#. type: Content of: <section><itemizedlist><listitem><note><para>
-#: en/installer.xml:171
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><note><para>
+#: en/installer.xml:148
 msgid "The help is translated in the chosen language with the F2 key."
 msgstr "按 F2 键可以将帮助翻译为所选语言。"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:177
+#. type: Content of: <section><section><section><para><itemizedlist><listitem><para>
+#: en/installer.xml:152
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
 "<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
@@ -2130,17 +2228,23 @@ msgstr ""
 "mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
 "How_to_set_up_kernel_options</link>。"
 
-#. type: Content of: <section><para>
-#: en/installer.xml:180
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:159
+msgid "Using a Wired Network"
+msgstr ""
+
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:161
+#, fuzzy
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
-"Installation CD (Boot.iso or Boot-Nonfree.iso images):"
+"Installation CD (netinstall.iso or netinstall-nonfree.iso images):"
 msgstr ""
 "此处是使用有线网络安装 CD（Boot.iso 或 Boot-Nonfree.iso 镜像）安装时的默认欢"
 "迎界面："
 
-#. type: Content of: <section><para>
-#: en/installer.xml:183
+#. type: Content of: <section><section><section><para>
+#: en/installer.xml:165
 msgid ""
 "It does not allow to change the language, the available options are "
 "described in the screen. For more information about using a Wired Network-"
@@ -2151,34 +2255,31 @@ msgstr ""
 "多细节，请参考 <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install"
 "\">Mageia Wiki</link>。"
 
-#. type: Content of: <section><warning><para>
-#: en/installer.xml:189
+#. type: Content of: <section><section><section><warning><para>
+#: en/installer.xml:171
 msgid "The keyboard layout is the American one."
 msgstr "键盘布局为美式键盘。"
 
-#. type: Content of: <section><mediaobject>
-#: en/installer.xml:193
-msgid ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#. type: Content of: <section><section><section><mediaobject>
+#: en/installer.xml:175
+#, fuzzy
+msgid "<imageobject> <imagedata fileref=\"../dx-help.png\"/> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:200
+#. type: Content of: <section><section><title>
+#: en/installer.xml:183
 msgid "The installation steps"
 msgstr "安装步骤"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:203
+#: en/installer.xml:185
 msgid ""
 "The install process is divided into a number of steps, which can be followed "
 "on the side panel of the screen."
 msgstr "安装过程被分为多个步骤，可以在侧边栏看到安装进度。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:206
+#: en/installer.xml:188
 msgid ""
 "Each step has one or more screens which may also have <guibutton>Advanced</"
 "guibutton> buttons with extra, less commonly required, options."
@@ -2187,7 +2288,7 @@ msgstr ""
 "的选项。"
 
 #. type: Content of: <section><section><para>
-#: en/installer.xml:210
+#: en/installer.xml:192
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
@@ -2195,7 +2296,7 @@ msgstr ""
 "多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
 
 #. type: Content of: <section><section><note><para>
-#: en/installer.xml:214
+#: en/installer.xml:196
 msgid ""
 "If somewhere during install you decide to stop the installation, it is "
 "possible to reboot, but please think twice before you do this.  Once a "
@@ -2211,18 +2312,18 @@ msgstr ""
 "要重启，可以按 <guibutton>Alt Ctrl F2</guibutton> 切换到终端，然后按下 "
 "<guibutton>Alt Ctrl Delete</guibutton> 来触发重启操作。"
 
-#. type: Content of: <section><section><info><title>
-#: en/installer.xml:228
+#. type: Content of: <section><section><title>
+#: en/installer.xml:209
 msgid "Installation Problems and Possible Solutions"
 msgstr "安装问题和问题解决方案"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:234
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:212
 msgid "No Graphical Interface"
 msgstr "不使用图形界面"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:239
+#: en/installer.xml:216
 msgid ""
 "After the initial screen you did not reach the language selection screen. "
 "This can happen with some graphic cards and older systems. Try using low "
@@ -2232,7 +2333,7 @@ msgstr ""
 "系统中。请尝试在提示后输入 <code>vgalo</code> 来切换到较低分辨率。"
 
 #. type: Content of: <section><section><section><itemizedlist><listitem><para>
-#: en/installer.xml:246
+#: en/installer.xml:223
 msgid ""
 "If the hardware is very old, a graphical installation may not be possible. "
 "In this case it is worth trying a text mode installation. To use this hit "
@@ -2244,13 +2345,13 @@ msgstr ""
 "首个欢迎界面中按 Esc，然后按 Enter。在出现的黑色屏幕中，输入“text”，然后按 "
 "Enter，即可进入文本安装模式。"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:258
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:234
 msgid "The Install Freezes"
 msgstr "安装停止"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:261
+#: en/installer.xml:236
 msgid ""
 "If the system appeared to freeze during the installation, this may be a "
 "problem with hardware detection. In this case the automatic detection of "
@@ -2262,13 +2363,13 @@ msgstr ""
 "下，可以先跳过硬件检测过程：在命令提示后输入 <code>noauto</code>。此选项也可"
 "以与其他选项联合使用。"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:270
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:244
 msgid "RAM problem"
 msgstr "内存问题"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:273
+#: en/installer.xml:246
 msgid ""
 "These will rarely be needed, but in some cases the hardware may report the "
 "available RAM incorrectly. To specify this manually, you can use the "
@@ -2279,13 +2380,13 @@ msgstr ""
 "<code>mem=xxxM</code> 参数，其中 xxx 是 RAM 的总大小。例如，<code>mem=256M</"
 "code> 表示 RAM 的大小为 256MB。"
 
-#. type: Content of: <section><section><section><info><title>
-#: en/installer.xml:281
+#. type: Content of: <section><section><section><title>
+#: en/installer.xml:253
 msgid "Dynamic partitions"
 msgstr "动态分区"
 
 #. type: Content of: <section><section><section><para>
-#: en/installer.xml:284
+#: en/installer.xml:255
 msgid ""
 "If you converted your hard disk from \"basic\" format to \"dynamic\" format "
 "on Microsoft Windows, you must know that it is impossible to install Mageia "
@@ -3809,12 +3910,12 @@ msgstr ""
 "的提示窗口。"
 
 #. type: Content of: <section><info><title>
-#: en/selectLanguage.xml:15
+#: en/selectLanguage.xml:10
 msgid "Please choose a language to use"
 msgstr "请选择要使用的语言"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:18
+#: en/selectLanguage.xml:12
 msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <application>Mageia</application> will use this selection during "
@@ -3824,7 +3925,17 @@ msgstr ""
 "的安装过程中使用该语言。"
 
 #. type: Content of: <section><para>
-#: en/selectLanguage.xml:22
+#: en/selectLanguage.xml:16
+#, fuzzy
+msgid ""
+"Select your preferred language.  <application>Mageia</application> will use "
+"this selection during the installation and for your installed system."
+msgstr ""
+"请在地区列表中选择您的首选语言。<application>Mageia</application> 将会在之后"
+"的安装过程中使用该语言。"
+
+#. type: Content of: <section><para>
+#: en/selectLanguage.xml:19
 msgid ""
 "If it is likely that you will require several languages installed on your "
 "system, for yourself or other users, then you should use the "
@@ -3835,10 +3946,11 @@ msgstr ""
 "guibutton>按钮来添加语言。完成安装后添加额外语言是相对困难的。"
 
 #. type: Content of: <section><mediaobject>
-#: en/selectLanguage.xml:29
+#: en/selectLanguage.xml:25
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" fileref="
+"\"dx2-selectLanguage.png\" align=\"center\"/> </imageobject> <imageobject "
 "condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
@@ -3848,7 +3960,7 @@ msgstr ""
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
-#: en/selectLanguage.xml:39
+#: en/selectLanguage.xml:33
 msgid ""
 "Even if you choose more than one language, you must first choose one of them "
 "as your preferred language in the first language screen. It will also be "
@@ -3858,19 +3970,19 @@ msgstr ""
 "界面中），该语言会同时出现在多语言配置界面中。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:46
+#: en/selectLanguage.xml:39
 msgid ""
 "If your keyboard language is not the same as your preferred language, then "
 "it is advisable to install the language of your keyboard as well."
 msgstr "若您的键盘输入语言与首选语言不同，最好也同时安装该输入语言。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:52
+#: en/selectLanguage.xml:44
 msgid "Mageia uses UTF-8 (Unicode) support by default."
 msgstr "Mageia 默认使用 UTF-8（Unicode）格式。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:54
+#: en/selectLanguage.xml:45
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
@@ -3880,7 +3992,7 @@ msgstr ""
 "装的语言。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
-#: en/selectLanguage.xml:60
+#: en/selectLanguage.xml:50
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3931,12 +4043,12 @@ msgstr ""
 "过五键的鼠标。"
 
 #. type: Content of: <section><info><title>
-#: en/setupBootloaderAddEntry.xml:7
+#: en/setupBootloaderAddEntry.xml:6
 msgid "Add or Modify a Boot Menu Entry"
 msgstr "添加或修改引导菜单项"
 
 #. type: Content of: <section><para>
-#: en/setupBootloaderAddEntry.xml:11
+#: en/setupBootloaderAddEntry.xml:9
 msgid ""
 "To do that you need to manually edit /boot/grub2/custom.cfg or use the "
 "software grub-customizer instead (Available in the Mageia repositories)."
@@ -3945,7 +4057,7 @@ msgstr ""
 "从 Mageia 仓库中安装）来编辑引导项。"
 
 #. type: Content of: <section><note><para>
-#: en/setupBootloaderAddEntry.xml:16
+#: en/setupBootloaderAddEntry.xml:13
 msgid ""
 "For more information, see our wiki: <link ns2:href=\"https://wiki.mageia.org/"
 "en/Grub2-efi_and_Mageia\">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</"
@@ -4685,3 +4797,48 @@ msgid ""
 msgstr ""
 "下一步是复制文件到硬盘。这需要花费几分钟的时间。之后，您的屏幕会变黑一段时"
 "间，这是正常现象。"
+
+#~ msgid ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+#~ "doPartitionDisks3.png\" align=\"center\"/> </imageobject> <imageobject "
+#~ "condition=\"live\"> <imagedata fileref=\"live-doPartitionDisks3.png\" "
+#~ "align=\"center\"/> </imageobject>"
+
+#~ msgid "Custom"
+#~ msgstr "自定义"
+
+#~ msgid "<placeholder type=\"info\" id=\"0\"/>"
+#~ msgstr "<placeholder type=\"info\" id=\"0\"/>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" "
+#~ "align=\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+#~ "imageobject>"
+
+#~ msgid ""
+#~ "- Safe Settings, priority is given to the safer options to the detriment "
+#~ "of performances."
+#~ msgstr "- 安全设置，使用更安全的选项（同时会在一定程度上降低性能）"
+
+#~ msgid ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+#~ msgstr ""
+#~ "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+#~ "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"