Update translations

40 files changed, 6034 insertions, 3603 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 9b4cd757..a5223536 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.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: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-12-08 12:21+0000\n"
 "Last-Translator: Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -3903,8 +3903,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index ab6e16b0..2e5e1ba2 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-01-03 10:29+0000\n"
 "Last-Translator: Jan <hlafek99@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -3486,8 +3486,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/de.po b/docs/installer/de.po
index 8a5b1b50..b2378486 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.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: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-01-31 19:57+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -4219,11 +4219,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
diff --git a/docs/installer/el.po b/docs/installer/el.po
index 7728d47b..b2f4b4e2 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-14 06:12+0200\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
@@ -4120,8 +4120,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index a2447441..bdbd30ab 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: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
@@ -3787,8 +3787,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/es.po b/docs/installer/es.po
index 5ec103a5..9e0c97b3 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-17 06:23+0000\n"
 "Last-Translator: motitos\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -4051,8 +4051,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/et.po b/docs/installer/et.po
index 03d94934..7cd6b3f4 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-19 07:21+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -4007,8 +4007,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index ce312317..b65e8635 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-08 20:27+0100\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
@@ -4029,8 +4029,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 6eff1a54..74dc4518 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-01-31 20:02+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -4160,11 +4160,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index af4c8a3c..ef61602b 100644
--- a/docs/installer/hr.po
+++ b/docs/installer/hr.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: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-11-21 11:17+0000\n"
 "Last-Translator: Ivica  Kolić <ikoli@yahoo.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -3442,8 +3442,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
diff --git a/docs/installer/id.po b/docs/installer/id.po
index 9bcbc8c2..55302870 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: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-05-25 04:50+0000\n"
 "Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -4021,8 +4021,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/it.po b/docs/installer/it.po
index 17dea133..38caef4a 100644
--- a/docs/installer/it.po
+++ b/docs/installer/it.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-05-12 20:14+0000\n"
 "Last-Translator: Roberto Albano <randyichinose@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
@@ -3708,8 +3708,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index de32d440..6677a117 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-02-07 22:40+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -4034,11 +4034,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
@@ -4179,8 +4180,8 @@ msgid ""
 msgstr ""
 "Als u <code>Grub 2</code> als opstartlader heeft gekozen kunt u deze tool "
 "niet gebruiken om ingangen aan te passen. Klik op 'Volgende'. U kunt wel "
-"handmatig <code>/boot/grub2/custom.cfg</code> bewerken, of de tool <code>"
-"grub-customizer</code> gebruiken."
+"handmatig <code>/boot/grub2/custom.cfg</code> bewerken, of de tool "
+"<code>grub-customizer</code> gebruiken."
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:30
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index ce0afef5..a10b15bb 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-11-18 14:56+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -3687,8 +3687,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 6e519ac0..fa0ef953 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-08 23:39+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -4066,8 +4066,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 3bb826b6..0b21b461 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-14 14:35+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -4058,8 +4058,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index fa2e9cc7..1b5c7ba4 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: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-06-14 14:53+0000\n"
 "Last-Translator: Valentin XliN Saikov <saikov.vb@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
@@ -4148,8 +4148,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/sk.po b/docs/installer/sk.po
index 525a1255..0df4f9c3 100644
--- a/docs/installer/sk.po
+++ b/docs/installer/sk.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: 2016-01-24 10:17+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-01-24 16:48+0000\n"
 "Last-Translator: Jajo Pajo\n"
 "Language-Team: Slovak (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -92,8 +92,8 @@ msgstr "Poznámky k vydaniu"
 #: en/acceptLicense.xml:70
 msgid ""
 "Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release "
-"Notes</guibutton> button."
+"application> and are accessible clicking on the <guibutton>Release Notes</"
+"guibutton> button."
 msgstr ""
 "Sú k dispozícii dôležité informácie o tomto vydaní <application>Mageia</"
 "application> a sú dostupné kliknutím na tlačidlo <guibutton>Poznámky k "
@@ -4134,11 +4134,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 9be38f3e..049e705b 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-07-07 16:37+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -3384,8 +3384,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index c89e9543..21cb85aa 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2015-11-23 01:15+0000\n"
 "Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
 "Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
@@ -3789,8 +3789,8 @@ msgstr ""
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
 "\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index ce89f478..18fd2b04 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-02-05 07:41+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -3960,12 +3960,19 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
+"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
+"</imagedata> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index 0d31040d..6a744c2d 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
-# 
+#
 # Translators:
 # Fırat Kutlu <firatkutlu@gmail.com>, 2013, 2014, 2015.
 # Yuri Chornoivan <yurchor@ukr.net>, 2013.
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-26 21:48+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-02-06 01:13+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -31,16 +31,16 @@ msgstr "Lisans ve Sürüm Notları"
 #: en/acceptLicense.xml:29
 msgid ""
 "<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>"
+"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>"
 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>"
+"<imageobject condition=\"classical\"> <imagedata xml:id=\"acceptLicense-"
+"im1\" revision=\"4\" align=\"center\" format=\"PNG\" fileref=\"dx2-license."
+"png\"/> </imageobject> <imageobject> <imagedata xml:id=\"acceptLicense-im2\" "
+"revision=\"5\" align=\"center\" condition=\"live\" format=\"PNG\" fileref="
+"\"live-license.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:40
@@ -50,31 +50,39 @@ msgstr "Lisans Sözleşmesi"
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:43
 msgid ""
-"Before installing <application>Mageia</application>, please read the license"
-" terms and conditions carefully."
-msgstr "<application>Mageia</application> kurulumuna başlamadan önce lütfen lisans koşullarını dikkatle okuyun."
+"Before installing <application>Mageia</application>, please read the license "
+"terms and conditions carefully."
+msgstr ""
+"<application>Mageia</application> kurulumuna başlamadan önce lütfen lisans "
+"koşullarını dikkatle okuyun."
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:46
 msgid ""
-"These terms and conditions apply to the entire "
-"<application>Mageia</application> distribution and must be accepted before "
-"you can continue."
-msgstr "Bu koşullar <application>Mageia</application> dağıtımının tamamına uygulanır ve devam edilmeden önce mutlaka kabul edilmelidir."
+"These terms and conditions apply to the entire <application>Mageia</"
+"application> distribution and must be accepted before you can continue."
+msgstr ""
+"Bu koşullar <application>Mageia</application> dağıtımının tamamına uygulanır "
+"ve devam edilmeden önce mutlaka kabul edilmelidir."
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:50
 msgid ""
 "To accept, simply select <guilabel>Accept</guilabel> and then click on "
 "<guibutton>Next</guibutton>."
-msgstr "Kabul etmek için basitçe <guilabel>Onayla</guilabel> kutucuğunu seçin ve <guibutton>İleri</guibutton> düğmesine tıklayın."
+msgstr ""
+"Kabul etmek için basitçe <guilabel>Onayla</guilabel> kutucuğunu seçin ve "
+"<guibutton>İleri</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:53
 msgid ""
-"If you decide not to accept these conditions, then we thank you for looking."
-" Clicking <guibutton>Quit</guibutton> will reboot your computer."
-msgstr "Bu koşulları reddetmeye karar verdiyseniz, incelediğiniz için teşekkür ederiz. <guibutton>Çık</guibutton> düğmesine tıklamak bilgisayarınızı yeniden başlatacaktır."
+"If you decide not to accept these conditions, then we thank you for looking. "
+"Clicking <guibutton>Quit</guibutton> will reboot your computer."
+msgstr ""
+"Bu koşulları reddetmeye karar verdiyseniz, incelediğiniz için teşekkür "
+"ederiz. <guibutton>Çık</guibutton> düğmesine tıklamak bilgisayarınızı "
+"yeniden başlatacaktır."
 
 #. type: Content of: <section><section><info><title>
 #: en/acceptLicense.xml:63
@@ -84,9 +92,9 @@ msgstr "Sürüm Notları"
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
 msgid ""
-"Important information are given about this release of "
-"<application>Mageia</application> and are accessible clicking on the "
-"<guibutton>Release Notes</guibutton> button."
+"Important information are given about this release of <application>Mageia</"
+"application> and are accessible clicking on the <guibutton>Release Notes</"
+"guibutton> button."
 msgstr ""
 "<application>Mageia</application>nın bu yayımı ile ilgili önemli bilgiler "
 "verilmiştir. <guibutton>Sürüm Notları</guibutton> düğmesine tıklayarak bu "
@@ -103,27 +111,31 @@ msgstr "tr"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Veri Kaynağı Seçimi (Ek Kurulum Kaynağı Yapılandırın)"
 
-#.  papoteur 2013-04-13  - created
-#.  marja 2013-04-16 added screenshot and expanded title (because is was the
-#. same as for media_selection
-#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/
-#. s/at/during/ as suggested by Tristan Campbell
+#.  papoteur 2013-04-13  - created 
+#.  marja 2013-04-16 added screenshot and expanded title (because is was the same as for media_selection 
+#.  marja 2013-04-16 s/a optical/an optcal/ s/support/disc/ s/or or/or/ s/at/during/ as suggested by Tristan Campbell 
 #. type: Content of: <section><mediaobject>
 #: en/add_supplemental_media.xml:18
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" "
-"xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-add_supplemental_media-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-"
+"add_supplemental_media.png\" format=\"PNG\" revision=\"1\" xml:id=\"dx2-"
+"add_supplemental_media-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:24
 msgid ""
 "This screen gives you the list of already recognized repositories. You can "
-"add other sources for packages, like an optical disc or a remote source. The"
-" source selection determines which packages will be available for selection "
+"add other sources for packages, like an optical disc or a remote source. The "
+"source selection determines which packages will be available for selection "
 "during the next steps."
-msgstr "Bu ekran önceden tanımlanmış depoların listesini verir. Paketler için, optik disk veya uzak kaynak gibi başka kaynaklar ekleyebilirsiniz. Kaynak seçimi, ilerki adımlarda hangi paketlerin erişilebilir olacağını belirleyecektir."
+msgstr ""
+"Bu ekran önceden tanımlanmış depoların listesini verir. Paketler için, optik "
+"disk veya uzak kaynak gibi başka kaynaklar ekleyebilirsiniz. Kaynak seçimi, "
+"ilerki adımlarda hangi paketlerin erişilebilir olacağını belirleyecektir."
 
 #. type: Content of: <section><para>
 #: en/add_supplemental_media.xml:29
@@ -143,7 +155,11 @@ msgid ""
 "Mageia, like the Nonfree , the Tainted repositories and the Updates. With "
 "the URL, you can designate a specific repository or your own NFS "
 "installation."
-msgstr "Bir yansı veya bir URL bağlantısı seçmek (ilk girdi). Bir yansı seçerek Mageia tarafından yönetilen tüm depolara, mesela Nonfree, Tainted depoları ile Updates deposuna, erişim sağlarsınız. URL bağlantısı ile ise, belirli bir depoyu veya kendi NFS kurulumunuzu belirtirsiniz."
+msgstr ""
+"Bir yansı veya bir URL bağlantısı seçmek (ilk girdi). Bir yansı seçerek "
+"Mageia tarafından yönetilen tüm depolara, mesela Nonfree, Tainted depoları "
+"ile Updates deposuna, erişim sağlarsınız. URL bağlantısı ile ise, belirli "
+"bir depoyu veya kendi NFS kurulumunuzu belirtirsiniz."
 
 #. type: Content of: <section><note><para>
 #: en/add_supplemental_media.xml:46
@@ -154,43 +170,43 @@ msgid ""
 "64 bit and noarch packages, it will not be able to update the 32 bit "
 "packages. However, after adding an online mirror, installer will find the "
 "needed 32 bit packages there."
-msgstr "32 bit paketleri de içeren bir 64 bit kurulumunu güncellemek istiyorsanız, buradaki ağ protokollerinden birine tıklayarak çevrimiçi bir yansıyı eklemek üzere bu ekranı kullanmanız önerilir. 64 bit DVD iso sadece 64 bit ve noarch paketlerini içerdiğinden 32 bit paketleri güncelleyemecektir. Ancak, çevrimiçi bir yansı ekledikten sonra kurulum aracı gereken 32 bit paketleri bulabilir."
+msgstr ""
+"32 bit paketleri de içeren bir 64 bit kurulumunu güncellemek istiyorsanız, "
+"buradaki ağ protokollerinden birine tıklayarak çevrimiçi bir yansıyı eklemek "
+"üzere bu ekranı kullanmanız önerilir. 64 bit DVD iso sadece 64 bit ve noarch "
+"paketlerini içerdiğinden 32 bit paketleri güncelleyemecektir. Ancak, "
+"çevrimiçi bir yansı ekledikten sonra kurulum aracı gereken 32 bit paketleri "
+"bulabilir."
 
 #. type: Content of: <section><info><title>
 #: en/addUser.xml:3
 msgid "User and Superuser Management"
 msgstr "Kullanıcı ve Süper Kullanıcı Yönetimi"
 
-#.  Started by marja,using Led43's text, on 2012 03 27
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, finished the page using Led43's text in the wiki,
-#. but
-#.        changed his text about the Advanced User Managment screen (the only
-#. thing
-#.        about guest account there, is the box you can tick or untick to
-#. enable or
-#.        disable it, the rest is about the normal user you're adding in the
-#. previous
+#.  Started by marja,using Led43's text, on 2012 03 27 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, finished the page using Led43's text in the wiki, but
+#.        changed his text about the Advanced User Managment screen (the only thing 
+#.        about guest account there, is the box you can tick or untick to enable or 
+#.        disable it, the rest is about the normal user you're adding in the previous
 #.        screen), marja, 20120409
-#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't
-#. understand
-#.        "rbash" in the xguest warning - is that correct?
-#.  JohnR 2012-04-19 Language proofreading
-#.  marja 2012-04-24 Added screenshot
+#.  barjac 2012-04-13 moved explanation of xguest lower down. I don't understand
+#.        "rbash" in the xguest warning - is that correct? 
+#.  JohnR 2012-04-19 Language proofreading  
+#.  marja 2012-04-24 Added screenshot 
 #.  marja 2013-04-26 added new note
 #. type: Content of: <section><mediaobject>
 #: en/addUser.xml:28
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" "
-"align=\"center\" xml:id=\"setRootPassword-im1\" "
-"fileref=\"dx2-setRootPassword.png\" format=\"PNG\"/> </imageobject> "
-"<imageobject> <imagedata format=\"PNG\" fileref=\"live-user1.png\"/> "
-"</imageobject>"
+"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
+"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
+"\" format=\"PNG\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" "
+"fileref=\"live-user1.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align=\""
-"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png\" "
-"format=\"PNG\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" "
+"<imageobject condition=\"classical\"> <imagedata revision=\"1\" align="
+"\"center\" xml:id=\"setRootPassword-im1\" fileref=\"dx2-setRootPassword.png"
+"\" format=\"PNG\"/> </imageobject> <imageobject> <imagedata format=\"PNG\" "
 "fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
@@ -203,20 +219,31 @@ msgstr "Yönetici (kök) Parolasını Ayarlayın:"
 msgid ""
 "It is advisable for all <application>Mageia</application> installations to "
 "set a superuser or administrator's password, usually called the "
-"<emphasis>root password</emphasis> in Linux. As you type a password into the"
-" top box the colour of its shield will change from red to yellow to green "
+"<emphasis>root password</emphasis> in Linux. As you type a password into the "
+"top box the colour of its shield will change from red to yellow to green "
 "depending on the strength of the password. A green shield shows you are "
 "using a strong password. You need to repeat the same password in the box "
 "just below the first password box, this checks that you have not mistyped "
 "the first password by comparing them."
-msgstr "Tüm <application>Mageia</application> kurulumları için Linux' ta <emphasis>kök parolası</emphasis> olarak bilinen bir süper kullanıcı veya yönetici parolası belirlemeniz önerilir. Üstteki kutucuğa parolayı yazmaya başladığınızda kutucuktaki kalkan rengi, parolanızın gücü oranında kırmızıdan sarıya ve yeşile döner. Yeşil kalkan güçlü bir parola kullandığınızı gösterir. İlk parola kutucuğunun altındaki kutucuğa aynı parolayı yeniden girmelisiniz. Bu sayede ilk parolanın doğru yazılıp yazılmadığı denetlenir."
+msgstr ""
+"Tüm <application>Mageia</application> kurulumları için Linux' ta "
+"<emphasis>kök parolası</emphasis> olarak bilinen bir süper kullanıcı veya "
+"yönetici parolası belirlemeniz önerilir. Üstteki kutucuğa parolayı yazmaya "
+"başladığınızda kutucuktaki kalkan rengi, parolanızın gücü oranında "
+"kırmızıdan sarıya ve yeşile döner. Yeşil kalkan güçlü bir parola "
+"kullandığınızı gösterir. İlk parola kutucuğunun altındaki kutucuğa aynı "
+"parolayı yeniden girmelisiniz. Bu sayede ilk parolanın doğru yazılıp "
+"yazılmadığı denetlenir."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:53
 msgid ""
 "All passwords are case sensitive, it is best to use a mixture of letters "
 "(upper and lower case), numbers and other characters in a password."
-msgstr "Tüm parolalar büyük-küçük harfe duyarlıdır. Harflerin (büyük harf ve küçük harf), rakamların ve diğer karakterlerin bir parolada karışık kullanılması en iyisidir."
+msgstr ""
+"Tüm parolalar büyük-küçük harfe duyarlıdır. Harflerin (büyük harf ve küçük "
+"harf), rakamların ve diğer karakterlerin bir parolada karışık kullanılması "
+"en iyisidir."
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:61
@@ -229,29 +256,41 @@ msgid ""
 "Add a user here. A user has fewer rights than the superuser (root), but "
 "enough to surf the internet, use office applications or play games and "
 "anything else the average user does with his computer"
-msgstr "Buraya bir kullanıcı ekleyin. Bir kullanıcı, süper kullanıcıdan (kök) daha az yetkiye sahiptir; ancak internette gezinmeye, ofis uygulamalarını kullanmaya veya oyunları oynamaya ve ortalama bir kullanıcının bilgisayarında yaptığı diğer her şeyi  yapmaya yetkisi olur"
+msgstr ""
+"Buraya bir kullanıcı ekleyin. Bir kullanıcı, süper kullanıcıdan (kök) daha "
+"az yetkiye sahiptir; ancak internette gezinmeye, ofis uygulamalarını "
+"kullanmaya veya oyunları oynamaya ve ortalama bir kullanıcının "
+"bilgisayarında yaptığı diğer her şeyi  yapmaya yetkisi olur"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:70
 msgid ""
 "<guibutton>Icon</guibutton>: if you click on this button it will change the "
 "users icon."
-msgstr "<guibutton>Simge</guibutton>: bu düğmeye tıklarsanız kullanıcının simgesini değiştirebilirsiniz."
+msgstr ""
+"<guibutton>Simge</guibutton>: bu düğmeye tıklarsanız kullanıcının simgesini "
+"değiştirebilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:75
 msgid ""
 "<guilabel>Real Name</guilabel>: Insert the users real name into this text "
 "box."
-msgstr "<guilabel>Gerçek Ad</guilabel>: Kullanıcının gerçek adını bu metin kutusuna girin."
+msgstr ""
+"<guilabel>Gerçek Ad</guilabel>: Kullanıcının gerçek adını bu metin kutusuna "
+"girin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:80
 msgid ""
 "<guilabel>Login Name</guilabel>: Here you enter the user login name or let "
-"drakx use a version of the users real name. <emphasis>The login name is case"
-" sensitive.</emphasis>"
-msgstr "<guilabel>Giriş Adı</guilabel>: Burada kullanıcının giriş adını belirleyebilir veya drakx' in kullanıcının gerçek adının bir benzerini kullanmasına izin verebilirsiniz. <emphasis>Giriş adı büyük-küçük harfe duyarlıdır.</emphasis>"
+"drakx use a version of the users real name. <emphasis>The login name is case "
+"sensitive.</emphasis>"
+msgstr ""
+"<guilabel>Giriş Adı</guilabel>: Burada kullanıcının giriş adını "
+"belirleyebilir veya drakx' in kullanıcının gerçek adının bir benzerini "
+"kullanmasına izin verebilirsiniz. <emphasis>Giriş adı büyük-küçük harfe "
+"duyarlıdır.</emphasis>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
@@ -261,23 +300,28 @@ msgid ""
 "strength of the password. (See also <xref linkend=\"givePassword\"/>)"
 msgstr ""
 "<guilabel>Şifre</guilabel>: Bu metin kutusuna kullanıcı parolası yazın. "
-"Metin kutusunun sonunda şifre gücünü gösteren bir kalkan vardır. (Ayrıca bkz:"
-" <xref linkend=\"givePassword\"/>)"
+"Metin kutusunun sonunda şifre gücünü gösteren bir kalkan vardır. (Ayrıca "
+"bkz: <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
 msgid ""
 "<guilabel>Password (again)</guilabel>: Retype the user password into this "
-"text box and drakx will check you have the same password in each of the user"
-" password text boxes."
-msgstr "<guilabel>Parola (yeniden)</guilabel>: Kullanıcı parolasını bu metin kutusuna yeniden yazın ki drakx her bir kullanıcı parolası metin kutusunda aynı parolanın bulunduğunu denetleyebilsin."
+"text box and drakx will check you have the same password in each of the user "
+"password text boxes."
+msgstr ""
+"<guilabel>Parola (yeniden)</guilabel>: Kullanıcı parolasını bu metin "
+"kutusuna yeniden yazın ki drakx her bir kullanıcı parolası metin kutusunda "
+"aynı parolanın bulunduğunu denetleyebilsin."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:99
 msgid ""
 "Any user you add while installing Mageia, will have a world readable (but "
 "write protected) home directory."
-msgstr "Mageia' yı kurarken eklediğiniz her kullanıcı için herkes tarafından okunabilen (ancak yazılamayan) bir ev dizini oluşturulur."
+msgstr ""
+"Mageia' yı kurarken eklediğiniz her kullanıcı için herkes tarafından "
+"okunabilen (ancak yazılamayan) bir ev dizini oluşturulur."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:102
@@ -285,7 +329,10 @@ msgid ""
 "However, while using your new install, any user you add in <emphasis>MCC - "
 "System - Manage users on system</emphasis> will have a home directory that "
 "is both read and write protected."
-msgstr "Ancak, yeni kurulumunuzu kullanırken, <emphasis>MDM - Sistem - Sistemdeki Kullanıcıları Ayarlayın</emphasis> ile eklediğiniz her kullanıcı için hem okuma hem de yazma korumalı bir ev dizini oluşturulur."
+msgstr ""
+"Ancak, yeni kurulumunuzu kullanırken, <emphasis>MDM - Sistem - Sistemdeki "
+"Kullanıcıları Ayarlayın</emphasis> ile eklediğiniz her kullanıcı için hem "
+"okuma hem de yazma korumalı bir ev dizini oluşturulur."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:106
@@ -303,7 +350,10 @@ msgid ""
 "If you prefer world readable home directories, you might want to add all "
 "extra needed users in the <emphasis>Configuration - Summary</emphasis> step "
 "during the install. Choose <emphasis>User management</emphasis>."
-msgstr "Herkes tarafından okunabilen ev dizinleri tercihiniz ise diğer tüm kullanıcıları kurulum sırasında <emphasis>Yapılandırma - Özet</emphasis> adımında ekleyebilirsiniz. <emphasis>Kullanıcı yönetimi</emphasis>ni seçin."
+msgstr ""
+"Herkes tarafından okunabilen ev dizinleri tercihiniz ise diğer tüm "
+"kullanıcıları kurulum sırasında <emphasis>Yapılandırma - Özet</emphasis> "
+"adımında ekleyebilirsiniz. <emphasis>Kullanıcı yönetimi</emphasis>ni seçin."
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:115
@@ -337,7 +387,10 @@ msgid ""
 "Anything a guest with a default <emphasis>rbash</emphasis> guest account "
 "saves to his /home directory will be erased when he logs out.  The guest "
 "should save his important files to a USB key."
-msgstr "Öntanımlı bir <emphasis>rbash</emphasis> konuk hesabına sahip bir konuğun kendi /home dizinine kaydettiği her şey oturumunu kapattığında silinir.   Konuk önemli dosyalarını bir USB belleğe kaydetmelidir."
+msgstr ""
+"Öntanımlı bir <emphasis>rbash</emphasis> konuk hesabına sahip bir konuğun "
+"kendi /home dizinine kaydettiği her şey oturumunu kapattığında silinir.   "
+"Konuk önemli dosyalarını bir USB belleğe kaydetmelidir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:140
@@ -345,7 +398,11 @@ msgid ""
 "<guilabel>Enable guest account</guilabel>: Here you can enable or disable a "
 "guest account. The guest account allows a guest to log into and use the PC, "
 "but he has more restricted access than normal users."
-msgstr "<guilabel>Konuk hesabını etkinleştir</guilabel>: Burada bir konuk hesabını etkinleştirebilir veya devre dışı bırakabilirsiniz. Konuk hesabı, bir konuğunuzun bilgisayarda oturum açmasını ve kullanmasını sağlar; ancak normal kullanıcılardan çok daha sınırlı erişim verir."
+msgstr ""
+"<guilabel>Konuk hesabını etkinleştir</guilabel>: Burada bir konuk hesabını "
+"etkinleştirebilir veya devre dışı bırakabilirsiniz. Konuk hesabı, bir "
+"konuğunuzun bilgisayarda oturum açmasını ve kullanmasını sağlar; ancak "
+"normal kullanıcılardan çok daha sınırlı erişim verir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:147
@@ -353,7 +410,10 @@ msgid ""
 "<guilabel>Shell</guilabel>: This drop down list allows you to change the "
 "shell used by the user you are adding in the previous screen, options are "
 "Bash, Dash and Sh"
-msgstr "<guilabel>Kabuk</guilabel>: Bu açılır liste, bir önceki ekranda eklediğiniz kullanıcının kabuğunu değiştirmenizi sağlar. Seçenekler Bash, Dash ve Sh' dir."
+msgstr ""
+"<guilabel>Kabuk</guilabel>: Bu açılır liste, bir önceki ekranda eklediğiniz "
+"kullanıcının kabuğunu değiştirmenizi sağlar. Seçenekler Bash, Dash ve Sh' "
+"dir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:153
@@ -361,51 +421,54 @@ msgid ""
 "<guilabel>User ID</guilabel>: Here you can set the user ID for the user you "
 "are adding in the previous screen. This is a number.  Leave it blank unless "
 "you know what you are doing."
-msgstr "<guilabel>Kullanıcı Kimliği</guilabel>: Burada, bir önceki ekranda eklediğiniz kullanıcının kullanıcı kimliğini ayarlayabilirsiniz. Bu bir rakamdır.   Ne yaptığınızı bilmiyorsanız boş bırakın."
+msgstr ""
+"<guilabel>Kullanıcı Kimliği</guilabel>: Burada, bir önceki ekranda "
+"eklediğiniz kullanıcının kullanıcı kimliğini ayarlayabilirsiniz. Bu bir "
+"rakamdır.   Ne yaptığınızı bilmiyorsanız boş bırakın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:159
 msgid ""
 "<guilabel>Group ID</guilabel>: This lets you set the group ID.  Also a "
-"number, usually the same one as for the user. Leave it blank unless you know"
-" what you are doing."
-msgstr "<guilabel>Grup Kimliği</guilabel>:  Bu, grup kimliğini ayarlamanızı sağlar. Genellikle kullanıcınınki ile aynı olan bir rakamdır. Ne yaptığınızı biliyorsanız boş bırakın."
+"number, usually the same one as for the user. Leave it blank unless you know "
+"what you are doing."
+msgstr ""
+"<guilabel>Grup Kimliği</guilabel>:  Bu, grup kimliğini ayarlamanızı sağlar. "
+"Genellikle kullanıcınınki ile aynı olan bir rakamdır. Ne yaptığınızı "
+"biliyorsanız boş bırakın."
 
 #. type: Content of: <section><info><title>
 #: en/ask_mntpoint_s.xml:11
 msgid "Choose the mount points"
 msgstr "Bağlama noktasını seçin"
 
-#.  Made by marja on 2012 03 28
-#.  NEEDS TO BE REVIEWED!
-#.  SimonNZG 2012-04-03 has taken a look but needs to come back
-#.  removed para xml:id's, marja, 20120409
-#.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least
-#. ONE"
-#.        with "a", as I can't imagine having more than one root partition ;)
-#.  Lebarhon : I put [] where it seems having mistakes
-#.  Marja: you're right, in English English it is "its type", however, the
-#. Americans
-#.        write "it's type". And you're right about the redundant part, too, I
-#. removed it
-#.  And JohnR says the Americans are WRONG! :-))
-#.  2012-04-19  Language proofreading done
+#.  Made by marja on 2012 03 28 
+#.  NEEDS TO BE REVIEWED! 
+#.  SimonNZG 2012-04-03 has taken a look but needs to come back 
+#.  removed para xml:id's, marja, 20120409 
+#.  barjac 14/04/2012 Minor edit to improve grammar and replaced "at least ONE"
+#.        with "a", as I can't imagine having more than one root partition ;) 
+#.  Lebarhon : I put [] where it seems having mistakes 
+#.  Marja: you're right, in English English it is "its type", however, the Americans
+#.        write "it's type". And you're right about the redundant part, too, I removed it
+#.  And JohnR says the Americans are WRONG! :-)) 
+#.  2012-04-19  Language proofreading done 
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" "
-"fileref=\"dx2-chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id"
-"=\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-"
-"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id=\"live-"
-"chooseMountPoints-im1\"></imagedata> </imageobject>"
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
+"im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\""
-"dx2-chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id"
-"=\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
+"\"chooseMountPoints-im1\"></imagedata> </imageobject> <imageobject "
 "condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-im1\""
-"></imagedata> </imageobject>"
+"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
+"im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -413,46 +476,63 @@ msgid ""
 "Here you see the Linux partitions that have been found on your computer. If "
 "you don't agree with the <application>DrakX</application> suggestions, you "
 "can change the mount points."
-msgstr "Burada bilgisayarınızda bulunan sabit disk bölümlerini görebilirsiniz. <application>DrakX</application> önerilerini kullanmak istemiyorsanız bağlama noktalarını değiştirebilirsiniz."
+msgstr ""
+"Burada bilgisayarınızda bulunan sabit disk bölümlerini görebilirsiniz. "
+"<application>DrakX</application> önerilerini kullanmak istemiyorsanız "
+"bağlama noktalarını değiştirebilirsiniz."
 
 #. type: Content of: <section><note><para>
 #: en/ask_mntpoint_s.xml:42
 msgid ""
 "If you change anything, make sure you still have a <literal>/</literal> "
 "(root) partition."
-msgstr "Bir şeyi değiştirirseniz, <literal>/</literal> (kök) disk bölümünüzün olduğundan emin olun."
+msgstr ""
+"Bir şeyi değiştirirseniz, <literal>/</literal> (kök) disk bölümünüzün "
+"olduğundan emin olun."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:48
 msgid ""
-"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount "
-"point\", \"Type\")."
-msgstr "Her disk bölümü şöyle görüntülenir: \"Aygıt\" (\"Boyut\", \"Bağlama noktası\", \"Türü\")."
+"Every partition is shown as follows: \"Device\" (\"Capacity\", \"Mount point"
+"\", \"Type\")."
+msgstr ""
+"Her disk bölümü şöyle görüntülenir: \"Aygıt\" (\"Boyut\", \"Bağlama noktası"
+"\", \"Türü\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:53
 msgid ""
 "\"Device\", is made up of: \"hard drive\", [\"hard drive number\"(letter)], "
 "\"partition number\" (for example, \"sda5\")."
-msgstr "\"Aygıt\", şunları ifade eder: \"sabit disk\", [\"sabit disk numarası\" (harf)] , \"disk bölümü numarası\" (mesela, \"sda5\")."
+msgstr ""
+"\"Aygıt\", şunları ifade eder: \"sabit disk\", [\"sabit disk numarası"
+"\" (harf)] , \"disk bölümü numarası\" (mesela, \"sda5\")."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:59
 msgid ""
-"If you have many partitions, you can choose many different mount points from"
-" the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
+"If you have many partitions, you can choose many different mount points from "
+"the drop down menu, such as <literal>/</literal>, <literal>/home</literal> "
 "and <literal>/var</literal>. You can even make your own mount points, for "
 "instance <literal>/video</literal> for a partition where you want to store "
-"your films, or <literal>/cauldron-home</literal> for the "
-"<literal>/home</literal> partition of a cauldron install."
-msgstr "Bir çok disk bölümünüz varsa, açılır menüden bir çok farklı bağlama noktasını seçebilirsiniz, mesela <literal>/</literal>, <literal>/home</literal> ve <literal>/var</literal>. Üstelik kendi disk bölümlerinizi de oluşturabilirsiniz. Mesela, filmlerinizi sakladığınız bir disk bölümü için <literal>/video</literal> veya cauldron kurulumunuzun <literal>/home</literal> disk bölümü için <literal>/cauldron-home</literal>."
+"your films, or <literal>/cauldron-home</literal> for the <literal>/home</"
+"literal> partition of a cauldron install."
+msgstr ""
+"Bir çok disk bölümünüz varsa, açılır menüden bir çok farklı bağlama "
+"noktasını seçebilirsiniz, mesela <literal>/</literal>, <literal>/home</"
+"literal> ve <literal>/var</literal>. Üstelik kendi disk bölümlerinizi de "
+"oluşturabilirsiniz. Mesela, filmlerinizi sakladığınız bir disk bölümü için "
+"<literal>/video</literal> veya cauldron kurulumunuzun <literal>/home</"
+"literal> disk bölümü için <literal>/cauldron-home</literal>."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:69
 msgid ""
 "For partitions you don't need to have access to, you can leave the mount "
 "point field blank."
-msgstr "Erişim sağlamaya gereksinim duymadığınız disk bölümleri için bağlama noktası alanını boş bırakabilirsiniz."
+msgstr ""
+"Erişim sağlamaya gereksinim duymadığınız disk bölümleri için bağlama noktası "
+"alanını boş bırakabilirsiniz."
 
 #. type: Content of: <section><warning><para>
 #: en/ask_mntpoint_s.xml:75
@@ -460,15 +540,22 @@ msgid ""
 "Choose <guibutton>Previous</guibutton> if you are not sure what to choose, "
 "and then tick <guilabel>Custom disk partitioning</guilabel>. In the screen "
 "that follows, you can click on a partition to see its type and size."
-msgstr "Neyi seçeceğinizden emin değilseniz <guibutton>Geri</guibutton> düğmesini seçebilir ve sonra <guilabel>Özel Disk Bölümlendirme</guilabel> seçeneğini işaretleyebilirsiniz. Sonraki ekranda bir disk bölümüne tıklayarak türünü ve boyutunu görebilirsiniz."
+msgstr ""
+"Neyi seçeceğinizden emin değilseniz <guibutton>Geri</guibutton> düğmesini "
+"seçebilir ve sonra <guilabel>Özel Disk Bölümlendirme</guilabel> seçeneğini "
+"işaretleyebilirsiniz. Sonraki ekranda bir disk bölümüne tıklayarak türünü ve "
+"boyutunu görebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:81
 msgid ""
-"If you are sure the mount points are correct, click on "
-"<guibutton>Next</guibutton>, and choose whether you only want to format the "
-"partition(s) DrakX suggests, or more."
-msgstr "Bağlama noktalarının doğru olduğundan eminseniz <guibutton>İleri</guibutton> düğmesine tıklayabilir ve DrakX tarafından önerilen disk bölümlerini biçimlendirmeyi veya daha fazlasını yapmayı seçebilirsiniz."
+"If you are sure the mount points are correct, click on <guibutton>Next</"
+"guibutton>, and choose whether you only want to format the partition(s) "
+"DrakX suggests, or more."
+msgstr ""
+"Bağlama noktalarının doğru olduğundan eminseniz <guibutton>İleri</guibutton> "
+"düğmesine tıklayabilir ve DrakX tarafından önerilen disk bölümlerini "
+"biçimlendirmeyi veya daha fazlasını yapmayı seçebilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/bestTime.xml:10
@@ -519,8 +606,8 @@ msgstr "Bir diskten"
 #: en/bootLive.xml:16
 msgid ""
 "You can boot directly from the media you used to burn your image (CD-ROM, "
-"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the"
-" bootloader to launch the installation automatically after rebooting the "
+"DVD-ROM...). You usually just need to insert it in your CD/DVD drive for the "
+"bootloader to launch the installation automatically after rebooting the "
 "computer. If that does not happen you may need to reconfigure your BIOS or "
 "press one key that will offer you to choose the peripheral from which the "
 "computer will boot."
@@ -584,10 +671,10 @@ msgstr "Orta menüde, üç eylem arasında seçim yapabilirsiniz:"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:61
 msgid ""
-"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD"
-" or USB stick) without writing anything on the disk, so expect a very slow "
-"system. Once the boot is done, you can proceed to the installation on a hard"
-" disk."
+"Boot Mageia: That means Mageia 5 will start from the connected media (CD/DVD "
+"or USB stick) without writing anything on the disk, so expect a very slow "
+"system. Once the boot is done, you can proceed to the installation on a hard "
+"disk."
 msgstr ""
 "Mageia'yı Başlat: Mageia 5, sabit diske herhangi bir şey yazmadan bağlanan "
 "kurulum ortamından (CD/DVD veya USB bellek) başlatılır. Ancak, çok yavaş "
@@ -618,7 +705,8 @@ msgstr "Alt menüde Önyükleme Seçenekleri bulunmaktadır:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:83
-msgid "F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
+msgid ""
+"F1 - Help. Explain the options \"splash\", \"apm\", \"acpi\" and \"Ide\""
 msgstr ""
 "F1 -Yardım. \"splash\", \"apm\", \"acpi\" ve \"Ide\" seçenekleini açıklar"
 
@@ -629,8 +717,7 @@ msgstr "F2 - Dil. Ekranlarda görüntülenecek dili seçin."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/bootLive.xml:93
-msgid ""
-"F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
+msgid "F3 - Screen resolution. Choose between text, 640x400, 800x600, 1024x728"
 msgstr ""
 "F3 - Ekran çözünürlüğü. Metin, 640x400, 800x600,1024x728 seçeneklerinden "
 "birini seçin"
@@ -705,16 +792,16 @@ msgid ""
 "duplicata of the previous lines suffixed with \"USB\". You have to choose "
 "them."
 msgstr ""
-"Bir USB bellekten başlattıysanız, önceki satırların tekrarı olan ancak \""
-"USB\" ön eki bulunan iki ek satır daha görürsünüz. Bu ek satırlar arasından "
+"Bir USB bellekten başlattıysanız, önceki satırların tekrarı olan ancak \"USB"
+"\" ön eki bulunan iki ek satır daha görürsünüz. Bu ek satırlar arasından "
 "seçim yapmalısınız."
 
 #. type: Content of: <section><section><para>
 #: en/bootLive.xml:139
 msgid ""
 "In each case, the first steps will be the same to choose language, timezone "
-"and keyboard, then the processes differ, with <link "
-"linkend=\"testing\">additional steps in Live mode</link>."
+"and keyboard, then the processes differ, with <link linkend=\"testing"
+"\">additional steps in Live mode</link>."
 msgstr ""
 "Her durumda, ilk adımları yani dil seçimi, saat dilimi ve klavye seçimi "
 "aynıdır. Sonrasında ise işlem <link linkend=\"testing\">ÇalışanCD kipinde ek "
@@ -728,9 +815,11 @@ msgstr "Masaüstü Seçimi"
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:11
 msgid ""
-"Depending on your selection here, you may be offered further screens to fine"
-" tune your choice."
-msgstr "Buradaki seçiminize dayalı olarak seçtiğinizi ayarlamak için başka ekranlar önerilebilir."
+"Depending on your selection here, you may be offered further screens to fine "
+"tune your choice."
+msgstr ""
+"Buradaki seçiminize dayalı olarak seçtiğinizi ayarlamak için başka ekranlar "
+"önerilebilir."
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:13
@@ -738,14 +827,18 @@ msgid ""
 "After the selection step(s), you will see a slide show during package "
 "installation. The slide show can be disabled by pressing the "
 "<guilabel>Details</guilabel> button"
-msgstr "Seçim adımlarından sonra paket kurulumu sırasında bir sunum göreceksiniz. Sunumu <guilabel>Ayrıntılar</guilabel> düğmesine tıklayarak kapatabilirsiniz"
+msgstr ""
+"Seçim adımlarından sonra paket kurulumu sırasında bir sunum göreceksiniz. "
+"Sunumu <guilabel>Ayrıntılar</guilabel> düğmesine tıklayarak kapatabilirsiniz"
 
 #. type: Content of: <section><mediaobject>
 #: en/chooseDesktop.xml:20
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
 "format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
+"format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:26
@@ -757,21 +850,30 @@ msgid ""
 "default software choices for these desktop environments. The "
 "<application>LXDE</application> desktop is lighter than the previous two, "
 "sporting less eye candy and fewer packages installed by default."
-msgstr "Masaüstü ortamlarından <application>KDE</application> mi yoksa <application>Gnome</application> masaüstü mü kullanmak istediğinizi seçin. Her ikisi de faydalı uygulama ve araçların tam seti ile gelir. Hiçbirini kullanmak istemiyor veya her ikisini de kullanmak istiyor ya da bu masaüstü ortamları için öntanımlı olanlardan farklı yazılımlar kullanmak istiyorsanız <guilabel>Kişisel</guilabel> seçeneğini işaretleyin. <application>LXDE</application> masaüstü bunların ikisinden de hafif olup öntanımlı olarak daha az paket kurulur  ve göze hoş gelen özellikleri daha azdır."
+msgstr ""
+"Masaüstü ortamlarından <application>KDE</application> mi yoksa "
+"<application>Gnome</application> masaüstü mü kullanmak istediğinizi seçin. "
+"Her ikisi de faydalı uygulama ve araçların tam seti ile gelir. Hiçbirini "
+"kullanmak istemiyor veya her ikisini de kullanmak istiyor ya da bu masaüstü "
+"ortamları için öntanımlı olanlardan farklı yazılımlar kullanmak istiyorsanız "
+"<guilabel>Kişisel</guilabel> seçeneğini işaretleyin. <application>LXDE</"
+"application> masaüstü bunların ikisinden de hafif olup öntanımlı olarak daha "
+"az paket kurulur  ve göze hoş gelen özellikleri daha azdır."
 
 #. type: Content of: <section><info><title>
 #: en/choosePackageGroups.xml:4
 msgid "Package Group Selection"
 msgstr "Paket Grubu Seçimi"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackageGroups.xml:10
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackageGroups.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:16
@@ -780,7 +882,11 @@ msgid ""
 "your system a lot easier. The groups are fairly self explanatory, however "
 "more information about the content of each is available in tool-tips which "
 "become visible as the mouse is hovered over them."
-msgstr "Paketler, sisteminiz için gereksinim duyduklarınızı daha kolay seçebilmeniz için gruplar halinde sıralanmıştır. Gruplar bir parça açıklayıcıdır ancak her biri hakkında daha fazla bilgi fare üzerine getirildiğinde ipucu olarak görüntülenebilir."
+msgstr ""
+"Paketler, sisteminiz için gereksinim duyduklarınızı daha kolay seçebilmeniz "
+"için gruplar halinde sıralanmıştır. Gruplar bir parça açıklayıcıdır ancak "
+"her biri hakkında daha fazla bilgi fare üzerine getirildiğinde ipucu olarak "
+"görüntülenebilir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/choosePackageGroups.xml:23
@@ -802,74 +908,90 @@ msgstr "Grafiksel Ortam."
 msgid ""
 "Individual Package Selection: You can use this option to manually add or "
 "remove packages."
-msgstr "Tek tek paket seçimi: El ile ekleme veya paket kaldırmak için bu seçeneği kullanabilirsiniz."
+msgstr ""
+"Tek tek paket seçimi: El ile ekleme veya paket kaldırmak için bu seçeneği "
+"kullanabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:39
 msgid ""
-"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do"
-" a minimal install (without or with X &amp; IceWM)."
-msgstr "En ufak kurulumu (X olmadan veya X ile &amp; IceWM) nasıl yapacağınıza dair yönergeler için <xref linkend=\"minimal-install\"></xref> yardımını okuyun."
+"Read <xref linkend=\"minimal-install\"></xref> for instructions on how to do "
+"a minimal install (without or with X &amp; IceWM)."
+msgstr ""
+"En ufak kurulumu (X olmadan veya X ile &amp; IceWM) nasıl yapacağınıza dair "
+"yönergeler için <xref linkend=\"minimal-install\"></xref> yardımını okuyun."
 
 #. type: Content of: <section><info><title>
 #: en/choosePackagesTree.xml:4
 msgid "Choose Individual Packages"
 msgstr "Paketleri Tek Tek Seçin"
 
-#. 2012-12-26 marja - exported this section from choosePackages.xml to start a
-#. new page
+#. 2012-12-26 marja - exported this section from choosePackages.xml to start a new page
 #. type: Content of: <section><mediaobject>
 #: en/choosePackagesTree.xml:11
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" "
-"align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align=\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-choosePackagesTree.png\" align="
+"\"center\" format=\"PNG\" ></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:17
 msgid ""
-"Here you can add or remove any extra packages to customise your "
-"installation."
-msgstr "Kurulumunuzu kişiselleştirmek için burada, tüm ek paketleri kurabilir veya kaldırabilirsiniz."
+"Here you can add or remove any extra packages to customise your installation."
+msgstr ""
+"Kurulumunuzu kişiselleştirmek için burada, tüm ek paketleri kurabilir veya "
+"kaldırabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:20
 msgid ""
-"After having made your choice, you can click on the <guibutton>floppy "
-"icon</guibutton> at the bottom of the page to save your choice of packages "
-"(saving to a USB key works, too). You can then use this file to install the "
-"same packages on another system, by pressing the same button during install "
-"and choosing to load it."
-msgstr "Seçiminizi yaptıktan sonra, paket seçiminizi (bir USB belleğe de olabilir) kaydetmek için sayfanın en altındaki <guibutton>disket simgesine</guibutton> tıklayabilirsiniz. Bu dosyayı kurulum esnasında aynı düğmeye tıklayarak ve yüklemeyi seçerek, aynı paketleri bir başka bilgisayarda da kurabilirsiniz."
+"After having made your choice, you can click on the <guibutton>floppy icon</"
+"guibutton> at the bottom of the page to save your choice of packages (saving "
+"to a USB key works, too). You can then use this file to install the same "
+"packages on another system, by pressing the same button during install and "
+"choosing to load it."
+msgstr ""
+"Seçiminizi yaptıktan sonra, paket seçiminizi (bir USB belleğe de olabilir) "
+"kaydetmek için sayfanın en altındaki <guibutton>disket simgesine</guibutton> "
+"tıklayabilirsiniz. Bu dosyayı kurulum esnasında aynı düğmeye tıklayarak ve "
+"yüklemeyi seçerek, aynı paketleri bir başka bilgisayarda da kurabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/configureServices.xml:12
 msgid "Configure your Services"
 msgstr "Hizmetleri Yapılandırma"
 
-#.  2012-12-25 marja - moved this section out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureServices.xml:21
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" xml:id"
-"=\"configureServices-im1\"></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureServices.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureServices-im1\"></"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:27
 msgid ""
-"Here you can set which services should (not) start when you boot your "
-"system."
-msgstr "Burada sisteminizi başlattığınızda hangi hizmetlerin başlatıl(may)acağını ayarlayabilirsiniz."
+"Here you can set which services should (not) start when you boot your system."
+msgstr ""
+"Burada sisteminizi başlattığınızda hangi hizmetlerin başlatıl(may)acağını "
+"ayarlayabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:30
 msgid ""
-"There are four groups, click on the triangle before a group to expand it and"
-" see all services in it."
-msgstr "Dört grup vardır. Bir grubun önündeki ok işaretine tıklayarak grup içindeki hizmetleri görüntüleyebilirsiniz."
+"There are four groups, click on the triangle before a group to expand it and "
+"see all services in it."
+msgstr ""
+"Dört grup vardır. Bir grubun önündeki ok işaretine tıklayarak grup içindeki "
+"hizmetleri görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:34
@@ -881,55 +1003,65 @@ msgstr "DrakX tarafından seçilen ayarlar genellikle en iyi ayarlardır."
 msgid ""
 "If you highlight a service, some information about it is shown in the info "
 "box below."
-msgstr "Bir hizmeti vurgularsanız, o hizmet hakkındaki bilgi alttaki kutuda görüntülenir."
+msgstr ""
+"Bir hizmeti vurgularsanız, o hizmet hakkındaki bilgi alttaki kutuda "
+"görüntülenir."
 
 #. type: Content of: <section><para>
 #: en/configureServices.xml:41
 msgid "Only change things when you know very well what you are doing."
-msgstr "Ne yaptığınızı çok ama çok iyi bir şekilde biliyorsanız burada bir şeyleri değiştirin."
+msgstr ""
+"Ne yaptığınızı çok ama çok iyi bir şekilde biliyorsanız burada bir şeyleri "
+"değiştirin."
 
 #. type: Content of: <section><info><title>
 #: en/configureTimezoneUTC.xml:3
 msgid "Configure your Timezone"
 msgstr "Zaman Dilimini Yapılandırma"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/configureTimezoneUTC.xml:11
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata xml:id"
-"=\"configureTimezoneUTC-im1\" revision=\"1\" "
-"fileref=\"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> "
-"</imageobject> <imageobject> <imagedata fileref=\"live-timeZone.png\" "
-"condition=\"live\" format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id="
+"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
+"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
+"format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata xml:id"
-"=\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\""
-"dx2-configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> "
-"</imageobject> <imageobject> <imagedata fileref=\"live-timeZone.png\" "
-"condition=\"live\" format=\"PNG\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata xml:id="
+"\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
+"configureTimezoneUTC.png\" align=\"center\" format=\"PNG\"/> </imageobject> "
+"<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
+"format=\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
 msgid ""
-"Choose your time zone by choosing your country or a city close to you in the"
-" same time zone."
-msgstr "Zaman diliminizi ülkenizi veya aynı zaman  diliminde olup da size yakın bulunan bir şehri seçerek belirleyin."
+"Choose your time zone by choosing your country or a city close to you in the "
+"same time zone."
+msgstr ""
+"Zaman diliminizi ülkenizi veya aynı zaman  diliminde olup da size yakın "
+"bulunan bir şehri seçerek belirleyin."
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:24
 msgid ""
-"In next screen you can choose to set your hardware clock to local time or to"
-" GMT, also known as UTC."
-msgstr "Sonraki ekranda donanım saatinizi yerel zamana veya UTC olarak da bilinen GMT zamanına göre ayarlayın."
+"In next screen you can choose to set your hardware clock to local time or to "
+"GMT, also known as UTC."
+msgstr ""
+"Sonraki ekranda donanım saatinizi yerel zamana veya UTC olarak da bilinen "
+"GMT zamanına göre ayarlayın."
 
 #. type: Content of: <section><note><para>
 #: en/configureTimezoneUTC.xml:29
 msgid ""
 "If you have more than one operating system on your computer, make sure they "
 "are all set to local time, or all to UTC/GMT."
-msgstr "Bilgisayarınızda birden fazla işletim sistemi bulunuyorsa, tümünün yerel zamana veya tümünün UTC/GMT zamanına ayarlı olduğundan emin olun."
+msgstr ""
+"Bilgisayarınızda birden fazla işletim sistemi bulunuyorsa, tümünün yerel "
+"zamana veya tümünün UTC/GMT zamanına ayarlı olduğundan emin olun."
 
 #. type: Content of: <section><info><title>
 #: en/configureX_card_list.xml:11
@@ -939,24 +1071,31 @@ msgstr "Bir X Sunucusu Seçme (Ekran Kartını Yapılandırma)"
 #. type: Content of: <section><mediaobject>
 #: en/configureX_card_list.xml:16
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id"
-"=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" "
-"format=\"PNG\"/> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
+"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
+"\"PNG\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:21
 msgid ""
 "DrakX has a very comprehensive database of video cards and will usually "
 "correctly identify your video device."
-msgstr "DrakX; ekran kartlarının karşılaştırmalı veritabanına sahip olup genellikle ekran kartınızı doğru olarak tanımlar."
+msgstr ""
+"DrakX; ekran kartlarının karşılaştırmalı veritabanına sahip olup genellikle "
+"ekran kartınızı doğru olarak tanımlar."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:24
 msgid ""
 "If the installer has not correctly detected your graphic card and you know "
 "which one you have, you can select it from the tree by:"
-msgstr "Kurulum aracı ekran kartınızı doğru olarak algılayamamışsa ve kartınızın hangisi olduğunu biliyorsanız, kartınızı ağaçtan şuna göre seçebilirsiniz:"
+msgstr ""
+"Kurulum aracı ekran kartınızı doğru olarak algılayamamışsa ve kartınızın "
+"hangisi olduğunu biliyorsanız, kartınızı ağaçtan şuna göre seçebilirsiniz:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/configureX_card_list.xml:27 en/configureX_monitor.xml:69
@@ -979,7 +1118,10 @@ msgid ""
 "If you cannot find your card in the vendor lists (because it's not yet in "
 "the database or it's an older card) you may find a suitable driver in the "
 "Xorg category"
-msgstr "Üretici listelerinde kartınızı (henüz veritabanına girmediği veya çok eski bir kart olduğu için) bulamıyorsanız uygun bir sürücüyü Xorg kategorisinde bulmanız mümkündür"
+msgstr ""
+"Üretici listelerinde kartınızı (henüz veritabanına girmediği veya çok eski "
+"bir kart olduğu için) bulamıyorsanız uygun bir sürücüyü Xorg kategorisinde "
+"bulmanız mümkündür"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:43
@@ -987,14 +1129,19 @@ msgid ""
 "The Xorg listing provides more than 40 generic and open source video card "
 "drivers. If you still can't find a named driver for your card there is the "
 "option of using the vesa driver which provides basic capabilities."
-msgstr "Xorg listeleme, 40'tan fazla genel ve açık kaynak ekran kartı sürücüleri sağlar. Kartınız için adlandırılmış bir sürücü hala bulamıyorsanız, temel yetenekleri sağlayan vesa sürücü kullanma seçeneğiniz mevcuttur."
+msgstr ""
+"Xorg listeleme, 40'tan fazla genel ve açık kaynak ekran kartı sürücüleri "
+"sağlar. Kartınız için adlandırılmış bir sürücü hala bulamıyorsanız, temel "
+"yetenekleri sağlayan vesa sürücü kullanma seçeneğiniz mevcuttur."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:48
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the Commandline Interface."
-msgstr "Uyumsuz sürücü seçerseniz yalnızca komut satırı arabirimine erişebileceğinizi unutmayın."
+msgstr ""
+"Uyumsuz sürücü seçerseniz yalnızca komut satırı arabirimine "
+"erişebileceğinizi unutmayın."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
@@ -1002,30 +1149,36 @@ msgid ""
 "Some video card manufacturers provide proprietary drivers for Linux which "
 "may only be available in the Nonfree repository and in some cases only from "
 "the card manufacturers' websites."
-msgstr "Bazı ekran kartı üreticileri, sadece Nonfree depolarında bulunabilen ve bazı durumlarda da sadece üreticinin web sitesinden edinilebilen müseccel sürücüler sunabilir."
+msgstr ""
+"Bazı ekran kartı üreticileri, sadece Nonfree depolarında bulunabilen ve bazı "
+"durumlarda da sadece üreticinin web sitesinden edinilebilen müseccel "
+"sürücüler sunabilir."
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:55
 msgid ""
 "The Nonfree repository needs to be explicitly enabled to access them.  If "
 "you didn't select it previously, you should do this after your first reboot."
-msgstr "Nonfree deposu ayrı olarak elle etkinleştirilmelidir. Önceden bu depoyu seçmediyseniz ilk yeniden başlatamadan sonra seçmelisiniz."
+msgstr ""
+"Nonfree deposu ayrı olarak elle etkinleştirilmelidir. Önceden bu depoyu "
+"seçmediyseniz ilk yeniden başlatamadan sonra seçmelisiniz."
 
 #. type: Content of: <section><info><title>
 #: en/configureX_chooser.xml:4
 msgid "Graphic Card and Monitor Configuration"
 msgstr "Ekran Kartı ve Monitör Yapılandırma"
 
-#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX"
-#. in the code by "configureX_chooser", because this is the correct filename
-#. for this page
+#.  Marja 2012-08-10, copied setupX.xml to this file and replaced all "setupX" in the code by "configureX_chooser", because this is the correct filename for this page
 #. type: Content of: <section><mediaobject>
 #: en/configureX_chooser.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureX_chooser.png"
+"\" align=\"center\" format=\"PNG\" xml:id=\"configureX_chooser-im1\"> </"
+"imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_chooser.xml:18
@@ -1034,19 +1187,30 @@ msgid ""
 "you chose for this install of <application>Mageia</application>, they are "
 "all based on a graphical user interface system called <acronym>X Window "
 "System</acronym>, or simply <acronym>X</acronym>. So in order for "
-"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or"
-" any other graphical environment to work well, the following "
-"<acronym>X</acronym> settings need to be correct. Choose the correct "
-"settings if you can see that <application>DrakX</application> didn't make a "
-"choice, or if you think the choice is incorrect."
-msgstr "<application>Mageia</application> kurulumu sırasında hangi grafiksel ortamı (ayrıca masaüstü ortamı olarak bilinirler) seçtiğiniz fark etmeksizin, bunların tümü <acronym>X Pencere Sistemi</acronym> olarak veya basitçe <acronym>X</acronym> olarak bilinen bir grafiksel kullanıcı arayüzü sistemine dayanırlar. Yani, <acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> veya herhangi başka bir grafiksel ortamın düzgün çalışabilmesi için <acronym>X</acronym> ayarlarının doğru yapılması gerekir. <application>DrakX</application> bir seçim yapamıyorsa veya seçimin yanlış olduğunu düşünüyorsanız doğru ayarları seçin."
+"<acronym>KDE</acronym>, <acronym>Gnome</acronym>, <acronym>LXDE</acronym> or "
+"any other graphical environment to work well, the following <acronym>X</"
+"acronym> settings need to be correct. Choose the correct settings if you can "
+"see that <application>DrakX</application> didn't make a choice, or if you "
+"think the choice is incorrect."
+msgstr ""
+"<application>Mageia</application> kurulumu sırasında hangi grafiksel ortamı "
+"(ayrıca masaüstü ortamı olarak bilinirler) seçtiğiniz fark etmeksizin, "
+"bunların tümü <acronym>X Pencere Sistemi</acronym> olarak veya basitçe "
+"<acronym>X</acronym> olarak bilinen bir grafiksel kullanıcı arayüzü "
+"sistemine dayanırlar. Yani, <acronym>KDE</acronym>, <acronym>Gnome</"
+"acronym>, <acronym>LXDE</acronym> veya herhangi başka bir grafiksel ortamın "
+"düzgün çalışabilmesi için <acronym>X</acronym> ayarlarının doğru yapılması "
+"gerekir. <application>DrakX</application> bir seçim yapamıyorsa veya seçimin "
+"yanlış olduğunu düşünüyorsanız doğru ayarları seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:31
 msgid ""
 "<emphasis><guibutton>Graphic card</guibutton></emphasis>: Choose your card "
 "from the list if needed."
-msgstr "<emphasis><guibutton>Ekran kartı</guibutton></emphasis>: Gerek duyarsanız listeden kartınızı seçin."
+msgstr ""
+"<emphasis><guibutton>Ekran kartı</guibutton></emphasis>: Gerek duyarsanız "
+"listeden kartınızı seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:37
@@ -1056,7 +1220,12 @@ msgid ""
 "from the <guilabel>Vendor</guilabel> or <guilabel>Generic</guilabel> list. "
 "Choose <guilabel>Custom</guilabel> if you prefer to manually set the "
 "horizontal and vertical refresh rates of your monitor."
-msgstr "<emphasis><guibutton>Monitör</guibutton></emphasis>: Mümkünse <guilabel>Tak ve Kullan</guilabel> seçebilir veya  <guilabel>Üretici</guilabel> ya da <guilabel>Genel</guilabel> listesinden monitörünüzü seçebilirsiniz. Monitörünüz için yatay ve dikey tazeleme oranlarını elle ayarlamak için <guilabel>Kişisel</guilabel> seçeneğini seçin."
+msgstr ""
+"<emphasis><guibutton>Monitör</guibutton></emphasis>: Mümkünse <guilabel>Tak "
+"ve Kullan</guilabel> seçebilir veya  <guilabel>Üretici</guilabel> ya da "
+"<guilabel>Genel</guilabel> listesinden monitörünüzü seçebilirsiniz. "
+"Monitörünüz için yatay ve dikey tazeleme oranlarını elle ayarlamak için "
+"<guilabel>Kişisel</guilabel> seçeneğini seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
 #: en/configureX_chooser.xml:45
@@ -1068,7 +1237,9 @@ msgstr "Yanlış tazeleme oranları monitörünüze zarar verebilir"
 msgid ""
 "<emphasis><guibutton>Resolution</guibutton></emphasis>: Set the desired "
 "resolution and color depth of your monitor here."
-msgstr "<emphasis><guibutton>Çözünürlük</guibutton></emphasis>: Arzu ettiğiniz çözünürlüğü ve renk derinliğini buradan seçin."
+msgstr ""
+"<emphasis><guibutton>Çözünürlük</guibutton></emphasis>: Arzu ettiğiniz "
+"çözünürlüğü ve renk derinliğini buradan seçin."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:56
@@ -1076,19 +1247,29 @@ msgid ""
 "<emphasis><guibutton>Test</guibutton></emphasis>: The test button does not "
 "always appear during install. If the button is there, you can control your "
 "settings by pressing it. If you see a question asking you whether your "
-"settings are correct, you can answer \"yes\", and the settings will be kept."
-" If you don't see anything, you'll return to the configuration screen and be"
-" able to reconfigure everything until the test is good. <emphasis>Make sure "
-"your settings are on the safe side if the test button isn't "
-"available</emphasis>"
-msgstr "<emphasis><guibutton>Dene</guibutton></emphasis>: Deneme düğmesi kurulum esnasında her zaman görüntülenmez. Düğme görüntüleniyorsa, ayarlarınızı bu düğmeye tıklayarak deneyebilirsiniz. Ayarlarınızın doğru olup olmadığını soran bir soru kutusu görüyorsanız \"evet\" cevabını vererek ayarların kaydedilmesini sağlayabilirsiniz. Herhangi bir şey görmüyorsanız yapılandırma ekranına geri yönlendirilirsiniz ve denemeniz başarılı oluncaya kadar her şeyi yeniden ayarlayabilirsiniz. <emphasis>Düğme görüntülenmiyorsa ayarlarınızın güvenli tarafta olduğundan emin olun</emphasis>"
+"settings are correct, you can answer \"yes\", and the settings will be kept. "
+"If you don't see anything, you'll return to the configuration screen and be "
+"able to reconfigure everything until the test is good. <emphasis>Make sure "
+"your settings are on the safe side if the test button isn't available</"
+"emphasis>"
+msgstr ""
+"<emphasis><guibutton>Dene</guibutton></emphasis>: Deneme düğmesi kurulum "
+"esnasında her zaman görüntülenmez. Düğme görüntüleniyorsa, ayarlarınızı bu "
+"düğmeye tıklayarak deneyebilirsiniz. Ayarlarınızın doğru olup olmadığını "
+"soran bir soru kutusu görüyorsanız \"evet\" cevabını vererek ayarların "
+"kaydedilmesini sağlayabilirsiniz. Herhangi bir şey görmüyorsanız "
+"yapılandırma ekranına geri yönlendirilirsiniz ve denemeniz başarılı oluncaya "
+"kadar her şeyi yeniden ayarlayabilirsiniz. <emphasis>Düğme görüntülenmiyorsa "
+"ayarlarınızın güvenli tarafta olduğundan emin olun</emphasis>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/configureX_chooser.xml:67
 msgid ""
 "<emphasis><guibutton>Options</guibutton></emphasis>: Here you can choose to "
 "enable or disable various options."
-msgstr "<emphasis><guibutton>Seçenekler</guibutton></emphasis>: Buradan bir çok seçeneği etkinleştirebilir veya devre dışı bırakabilirsiniz."
+msgstr ""
+"<emphasis><guibutton>Seçenekler</guibutton></emphasis>: Buradan bir çok "
+"seçeneği etkinleştirebilir veya devre dışı bırakabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/configureX_monitor.xml:18
@@ -1100,7 +1281,9 @@ msgstr "Monitör Seçimi"
 msgid ""
 "DrakX has a very comprehensive database of monitors and will usually "
 "correctly identify yours."
-msgstr "DrakX monitörlerin karşılaştırmalı veritabanına sahip olup genellikle monitörünüzü doğru olarak tanımlar."
+msgstr ""
+"DrakX monitörlerin karşılaştırmalı veritabanına sahip olup genellikle "
+"monitörünüzü doğru olarak tanımlar."
 
 #. type: Content of: <section><warning><para>
 #: en/configureX_monitor.xml:26
@@ -1109,15 +1292,22 @@ msgid ""
 "your monitor or video hardware. Please don't try something without knowing "
 "what you are doing.</emphasis> If in doubt you should consult your monitor "
 "documentation"
-msgstr "<emphasis>Farklı niteliklere sahip bir monitörü seçmek monitörünüze veya ekran kartınıza zarar verebilir. Ne yaptığınızı bilmiyorsanız bir şeyler yapmaya çalışmayın.</emphasis> Kararsız kaldığınız takdirde monitörünüzle gelen kılavuza bakın"
+msgstr ""
+"<emphasis>Farklı niteliklere sahip bir monitörü seçmek monitörünüze veya "
+"ekran kartınıza zarar verebilir. Ne yaptığınızı bilmiyorsanız bir şeyler "
+"yapmaya çalışmayın.</emphasis> Kararsız kaldığınız takdirde monitörünüzle "
+"gelen kılavuza bakın"
 
 #. type: Content of: <section><mediaobject>
 #: en/configureX_monitor.xml:34
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id"
-"=\"configureX_monitor-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor.png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-configureX_monitor."
+"png\" format=\"PNG\" revision=\"1\" xml:id=\"configureX_monitor-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:42
@@ -1128,10 +1318,14 @@ msgstr "<emphasis>Kişisel</emphasis>"
 #: en/configureX_monitor.xml:44
 msgid ""
 "This option allows you to set two critical parameters, the vertical refresh "
-"rate and the horizontal sync rate. Vertical refresh determines how often the"
-" screen is refreshed and horizontal sync is the rate at which scan lines are"
-" displayed."
-msgstr "Bu seçenek iki kritik parametreyi ayarlamanızı sağlar, dikey tazeleme oranı ve yatay tazeleme oranı. Dikey tazeleme oranı ekranın hangi sıklıkta tazeleneceğini belirler ve yatay ekran aralığı, hangi tarama hatlarının hangi oranda görüntüleneceğini belirler."
+"rate and the horizontal sync rate. Vertical refresh determines how often the "
+"screen is refreshed and horizontal sync is the rate at which scan lines are "
+"displayed."
+msgstr ""
+"Bu seçenek iki kritik parametreyi ayarlamanızı sağlar, dikey tazeleme oranı "
+"ve yatay tazeleme oranı. Dikey tazeleme oranı ekranın hangi sıklıkta "
+"tazeleneceğini belirler ve yatay ekran aralığı, hangi tarama hatlarının "
+"hangi oranda görüntüleneceğini belirler."
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:49
@@ -1140,7 +1334,11 @@ msgid ""
 "type with a sync range that is beyond the capabilities of your monitor: you "
 "may damage your monitor. If in doubt, choose a conservative setting and "
 "consult your monitor documentation."
-msgstr "Monitörünüzün kapasitesinin ötesinde bir monitör türü ve ekran aralığı belirlememeniz <emphasis>ÇOK ÖNEMLİDİR</emphasis>: monitörünüze zarar verebilirsiniz. Kararsız kalırsanız, ortalama bir ayar seçin ve monitörünüzün kılavuzuna bakın."
+msgstr ""
+"Monitörünüzün kapasitesinin ötesinde bir monitör türü ve ekran aralığı "
+"belirlememeniz <emphasis>ÇOK ÖNEMLİDİR</emphasis>: monitörünüze zarar "
+"verebilirsiniz. Kararsız kalırsanız, ortalama bir ayar seçin ve "
+"monitörünüzün kılavuzuna bakın."
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:55
@@ -1152,7 +1350,9 @@ msgstr "<emphasis>Tak ve Kullan</emphasis>"
 msgid ""
 "This is the default option and tries to determine the monitor type from the "
 "monitor database."
-msgstr "Öntanımlı seçenek budur. Monitör veritabanından monitör türünü bulmaya çalışır."
+msgstr ""
+"Öntanımlı seçenek budur. Monitör veritabanından monitör türünü bulmaya "
+"çalışır."
 
 #. type: Content of: <section><para>
 #: en/configureX_monitor.xml:63
@@ -1164,7 +1364,9 @@ msgstr "<emphasis>Üretici</emphasis>"
 msgid ""
 "If the installer has not correctly detected your monitor and you know which "
 "one you have, you can select it from the tree by selecting:"
-msgstr "Kurulum aracı monitörünüzü doğru olarak algılayamamışsa ve monitörünüzün hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre seçebilirsiniz:"
+msgstr ""
+"Kurulum aracı monitörünüzü doğru olarak algılayamamışsa ve monitörünüzün "
+"hangisi olduğunu biliyorsanız, monitörünüzü ağaçtan şuna göre seçebilirsiniz:"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/configureX_monitor.xml:73
@@ -1185,11 +1387,17 @@ msgstr "<emphasis>Genel</emphasis>"
 #: en/configureX_monitor.xml:84
 msgid ""
 "selecting this group displays nearly 30 display configurations such as "
-"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is"
-" often a good monitor selection group if you need to use the Vesa card "
-"driver when your video hardware cannot be determined automatically. Once "
-"again it may be wise to be conservative in your selections."
-msgstr "bu grubu seçmek, 1024x768@60Hz gibi yaklaşık 30 görüntü yapılandırması görüntüler ve dizüstü bilgisayarlarda kullanılanlar gibi Flat panel görüntülerini de içerir. Ekran kartınız kendiliğinden tanımlanamadığı için Vesa ekran kartı sürücüsü kullanmanız gerekiyorsa bu seçenek genellikle iyi bir monitör seçimi grubudur. Yine, seçimlerinizde ortalama değerleri seçmek akıllıca olur."
+"1024x768 @ 60Hz and includes Flat panel displays as used in laptops. This is "
+"often a good monitor selection group if you need to use the Vesa card driver "
+"when your video hardware cannot be determined automatically. Once again it "
+"may be wise to be conservative in your selections."
+msgstr ""
+"bu grubu seçmek, 1024x768@60Hz gibi yaklaşık 30 görüntü yapılandırması "
+"görüntüler ve dizüstü bilgisayarlarda kullanılanlar gibi Flat panel "
+"görüntülerini de içerir. Ekran kartınız kendiliğinden tanımlanamadığı için "
+"Vesa ekran kartı sürücüsü kullanmanız gerekiyorsa bu seçenek genellikle iyi "
+"bir monitör seçimi grubudur. Yine, seçimlerinizde ortalama değerleri seçmek "
+"akıllıca olur."
 
 #. type: Content of: <section><info><title>
 #: en/diskdrake.xml:20
@@ -1199,9 +1407,9 @@ msgstr "DiskDrake ile kişisel disk bölümlendirme"
 #. type: Content of: <section><mediaobject>
 #: en/diskdrake.xml:25
 msgid ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\""
-" align=\"center\"/> </imageobject> <imageobject condition='live' > "
-"<imagedata fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
+"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 msgstr ""
 "<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
 "align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
@@ -1211,39 +1419,54 @@ msgstr ""
 #: en/diskdrake.xml:34
 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"
-" encryption option for the <literal>/boot</literal> partition must NOT be "
+"must ensure that you have a separate <literal>/boot</literal> partition. The "
+"encryption option for the <literal>/boot</literal> partition must NOT be "
 "set, otherwise your system will be unbootable."
-msgstr "<literal>/</literal> disk bölümünüzde şifreleme kullanmak isterseniz ayrı bir <literal>/boot</literal> disk bölümünüzün mevcut olduğundan emin olmalısınız. <literal>/boot</literal> disk bölümünüz için şifreleme seçeneği işaretli OLMAMALIDIR; yoksa sisteminiz açılmayacaktır."
+msgstr ""
+"<literal>/</literal> disk bölümünüzde şifreleme kullanmak isterseniz ayrı "
+"bir <literal>/boot</literal> disk bölümünüzün mevcut olduğundan emin "
+"olmalısınız. <literal>/boot</literal> disk bölümünüz için şifreleme seçeneği "
+"işaretli OLMAMALIDIR; yoksa sisteminiz açılmayacaktır."
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:41
 msgid ""
 "Adjust the layout of your disk(s)  here. You can remove or create "
-"partitions, change the filesystem of a partition or change its size and even"
-" view what is in them before you start."
-msgstr "Disk yerleşim düzenini burada ayarlayın. Disk bölümleri oluşturabilir veya kaldırabilir, bir disk bölümünün dosya sistemini veya boyutunu değiştirebilir ve hatta başlamadan önce içinde neler olduğunu görüntüleyebilirsiniz."
+"partitions, change the filesystem of a partition or change its size and even "
+"view what is in them before you start."
+msgstr ""
+"Disk yerleşim düzenini burada ayarlayın. Disk bölümleri oluşturabilir veya "
+"kaldırabilir, bir disk bölümünün dosya sistemini veya boyutunu "
+"değiştirebilir ve hatta başlamadan önce içinde neler olduğunu "
+"görüntüleyebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:46
 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 "Algılanan her sabit disk veya USB bellek gibi diğer depolama aygıtı için bir sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
+"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 ""
+"Algılanan her sabit disk veya USB bellek gibi diğer depolama aygıtı için bir "
+"sekme bulunur. Üç tane varsa sda, sdb ve sdc gibi."
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:50
 msgid ""
-"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected"
-" storage device"
-msgstr "Seçili depolama aygıtındaki tüm bölümleri silmek için <guibutton>Tümünü Temizle</guibutton> düğmesine tıklayın"
+"Push <guibutton>Clear all</guibutton> to wipe all partitions on the selected "
+"storage device"
+msgstr ""
+"Seçili depolama aygıtındaki tüm bölümleri silmek için <guibutton>Tümünü "
+"Temizle</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:53
 msgid ""
 "For all other actions: click on the desired partition first. Then view it, "
 "or choose a filesystem and a mount point, resize it or wipe it."
-msgstr "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."
+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:57
@@ -1260,12 +1483,17 @@ msgstr "Hazır olunca <guibutton>Bitti</guibutton>' yi tıklayın."
 msgid ""
 "If you are installing Mageia on an UEFI system, check that an ESP (EFI "
 "System Partition) is present and correctly mounted on /boot/EFI (see above)"
-msgstr "Mageia' yı bir UEFI sisteme kuruyorsanız bir EFI Sistem Disk Bölümünün (ESP) mevcut olduğundan ve düzgün biçimde /boot/EFI üzerine bağlandığından emin olun (yukarıya bakın)"
+msgstr ""
+"Mageia' yı bir UEFI sisteme kuruyorsanız bir EFI Sistem Disk Bölümünün (ESP) "
+"mevcut olduğundan ve düzgün biçimde /boot/EFI üzerine bağlandığından emin "
+"olun (yukarıya bakın)"
 
 #. type: Content of: <section><note><para><mediaobject>
 #: en/diskdrake.xml:69
-msgid "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgid ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
 #: en/diskdrake.xml:68 en/installer.xml:41
@@ -1283,21 +1511,28 @@ 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 "
 "<application>Mageia</application>."
-msgstr "Bu ekranda sabit disklerinizin içeriğini görebilir ve DrakX bölümlendirme sihirbazının <application>Mageia</application>'nın nereye kurulacağına dair bulduğu çözümlere ulaşabilirsiniz."
+msgstr ""
+"Bu ekranda sabit disklerinizin içeriğini görebilir ve DrakX bölümlendirme "
+"sihirbazının <application>Mageia</application>'nın nereye kurulacağına dair "
+"bulduğu çözümlere ulaşabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/doPartitionDisks.xml:15
 msgid ""
 "The options available from the list below will vary depending on your "
 "particular hard drive(s) layout and content."
-msgstr "Aşağıdaki listeden kullanılabilen seçenekler, belirli sabit disklerinizin bölümlendirme düzeni ve içeriğine bağlı olarak değişecektir."
+msgstr ""
+"Aşağıdaki listeden kullanılabilen seçenekler, belirli sabit disklerinizin "
+"bölümlendirme düzeni ve içeriğine bağlı olarak değişecektir."
 
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:20
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-doPartitionDisks.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:27
@@ -1309,7 +1544,9 @@ msgstr "Mevcut Disk Bölümü Kullanılsın"
 msgid ""
 "If this option is available, then existing Linux compatible partitions have "
 "been found and may be used for the installation."
-msgstr "Bu seçenek erişilebilir durumdaysa Linux uyumlu önceden mevcut olan disk bölümleri bulunmuştur ve yükleme için kullanılabilir."
+msgstr ""
+"Bu seçenek erişilebilir durumdaysa Linux uyumlu önceden mevcut olan disk "
+"bölümleri bulunmuştur ve yükleme için kullanılabilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:36
@@ -1319,9 +1556,11 @@ msgstr "Boş Alan Kullanılsın"
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:38
 msgid ""
-"If you have unused space on your hard drive then this option will use it for"
-" your new Mageia installation."
-msgstr "Sabit diskinizde kullanılmayan boş alan varsa, yeni Mageia kurulumunuz için bu seçenek o alanı kullanacaktır."
+"If you have unused space on your hard drive then this option will use it for "
+"your new Mageia installation."
+msgstr ""
+"Sabit diskinizde kullanılmayan boş alan varsa, yeni Mageia kurulumunuz için "
+"bu seçenek o alanı kullanacaktır."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:44
@@ -1331,9 +1570,11 @@ msgstr "Windows Bölümündeki Boş Alan Kullanılsın"
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:47
 msgid ""
-"If you have unused space on an existing Windows partition, the installer may"
-" offer to use it."
-msgstr "Mevcut bir Windows bölümünde kullanılmayan alan varsa, kurulum aracı bunu kullanmayı önerebilir."
+"If you have unused space on an existing Windows partition, the installer may "
+"offer to use it."
+msgstr ""
+"Mevcut bir Windows bölümünde kullanılmayan alan varsa, kurulum aracı bunu "
+"kullanmayı önerebilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:51
@@ -1341,7 +1582,9 @@ 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 "
 "important files!"
-msgstr "Bu, yeni Mageia kurulumunuz için boş alan açmakta faydalı olabilir; ancak riskli bir işlem olduğundan önemli tüm dosyalarınızı yedeklemelisiniz!"
+msgstr ""
+"Bu, yeni Mageia kurulumunuz için boş alan açmakta faydalı olabilir; ancak "
+"riskli bir işlem olduğundan önemli tüm dosyalarınızı yedeklemelisiniz!"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:56
@@ -1352,7 +1595,12 @@ msgid ""
 "although this is not a guarantee that all files in the partition have been "
 "moved out of the area that is about to be used. It is highly recommended to "
 "back up your personal files."
-msgstr "Bu işlemin Windows bölümünün boyutunu azaltacağını unutmayın. Disk bölümü \"temiz\" olmalıdır; yani son kullanımında Windows düzgün şekilde kapatılmış olmalıdır. Bölümdeki tüm dosyaların kullanılacak alanın dışına taşındığına dair garanti sunmazsa da ayrıca mutlaka disk birleştirme yapılmalıdır. Kişisel dosyalarınızı yedeklemeniz önerilir."
+msgstr ""
+"Bu işlemin Windows bölümünün boyutunu azaltacağını unutmayın. Disk bölümü "
+"\"temiz\" olmalıdır; yani son kullanımında Windows düzgün şekilde kapatılmış "
+"olmalıdır. Bölümdeki tüm dosyaların kullanılacak alanın dışına taşındığına "
+"dair garanti sunmazsa da ayrıca mutlaka disk birleştirme yapılmalıdır. "
+"Kişisel dosyalarınızı yedeklemeniz önerilir."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:64
@@ -1371,9 +1619,11 @@ msgstr ""
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
 #: en/doPartitionDisks.xml:71
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:78
@@ -1388,7 +1638,9 @@ msgstr "Bu seçenek tüm sabit diski Mageia için kullanacaktır."
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:84
 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!"
+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:87
@@ -1396,7 +1648,10 @@ 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 "
 "this option."
-msgstr "Sabit diskin bir kısmını başka bir şey için kullanmak niyetindeyseniz veya disk üzerinde kaybetmeye henüz hazır olmadığınız verileriniz varsa bu seçeneği kullanmayın."
+msgstr ""
+"Sabit diskin bir kısmını başka bir şey için kullanmak niyetindeyseniz veya "
+"disk üzerinde kaybetmeye henüz hazır olmadığınız verileriniz varsa bu "
+"seçeneği kullanmayın."
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:94
@@ -1406,9 +1661,10 @@ msgstr "Özel"
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:96
 msgid ""
-"This gives you complete control over the placing of the installation on your"
-" hard drive(s)."
-msgstr "Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
+"This gives you complete control over the placing of the installation on your "
+"hard drive(s)."
+msgstr ""
+"Bu seçenek, sistemi sabit disklerinize kurarken size tam denetim sağlar.."
 
 #. type: Content of: <section><para>
 #: en/doPartitionDisks.xml:102
@@ -1434,13 +1690,11 @@ msgstr ""
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:115
 msgid ""
-"If the total available place is over 50 GB, then three partitions are "
-"created"
+"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>
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:120
 msgid ""
 "6/19 of the total available place is allocated to / with a maximum of 50 GB"
@@ -1448,14 +1702,12 @@ msgstr ""
 "Toplam boş alanın 6/19 kadarı en fazla 50 GB olacak şekilde / olarak "
 "ayarlanır"
 
-#. type: Content of:
-#. <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:125
 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>
+#. type: Content of: <section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:129
 msgid "the rest (at least 12/19) is allocated to /home"
 msgstr "kalanı (en az 12/19) ise /home olarak ayarlanır"
@@ -1474,9 +1726,9 @@ msgstr ""
 #: en/doPartitionDisks.xml:140
 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"
+"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"
 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 "
@@ -1490,8 +1742,8 @@ msgid ""
 "previous standard of 512 byte logical sectors. Due to lack of available "
 "hardware, the partitioning tool used in the installer has not been tested "
 "with such a drive. Also some ssd drives now use an erase block size over 1 "
-"MB. We suggest to pre-partition the drive, using an alternative partitioning"
-" tool like gparted, if you own such a device, and to use the following "
+"MB. We suggest to pre-partition the drive, using an alternative partitioning "
+"tool like gparted, if you own such a device, and to use the following "
 "settings:"
 msgstr ""
 "Bazı yeni sabit diskler eski standart olan 512 bayt mantıksal sektör yerine "
@@ -1516,7 +1768,9 @@ msgstr "\"Önündeki boş alan (MiB):\" \"2\""
 #: en/doPartitionDisks.xml:159
 msgid ""
 "Also make sure all partitions are created with an even number of megabytes."
-msgstr "Ayrıca tüm bölümlerin çift sayılı megabaytlar ile oluşturulduğundan emin olun."
+msgstr ""
+"Ayrıca tüm bölümlerin çift sayılı megabaytlar ile oluşturulduğundan emin "
+"olun."
 
 #. type: Content of: <article><info><title>
 #: en/DrakLive-cover.xml:4 en/DrakLive-cover.xml:30 en/DrakLive.xml:3
@@ -1553,27 +1807,37 @@ msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 #: en/DrakX.xml:12
 msgid ""
 "The texts and screenshots in this manual are available under the CC BY-SA "
-"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-"
+"3.0 license <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
+msgstr ""
+"Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile "
+"lisanslanmıştır <link ns6:href=\"http://creativecommons.org/licenses/by-"
 "sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
-msgstr "Bu el kitabındaki ekran görüntüleri ve metinler CC BY-SA3.0 ile lisanslanmıştır <link ns6:href=\"http://creativecommons.org/licenses/by-sa/3.0/\">http://creativecommons.org/licenses/by-sa/3.0/</link>."
 
 #. 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
 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.neodoc.biz\">NeoDoc</link>."
-msgstr "Bu el kitabı, <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link> tarafından geliştirilen <link ns6:href=\"http://www.calenco.com\">Calenco CMS</link> yardımıyla hazırlanmıştır."
+"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."
+"neodoc.biz\">NeoDoc</link>."
+msgstr ""
+"Bu el kitabı, <link ns6:href=\"http://www.neodoc.biz\">NeoDoc</link> "
+"tarafından geliştirilen <link ns6:href=\"http://www.calenco.com\">Calenco "
+"CMS</link> yardımıyla hazırlanmıştır."
 
 #. 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
 msgid ""
-"It was written by volunteers in their free time. Please contact <link "
-"ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation "
-"Team</link>, if you would like to help improve this manual."
-msgstr "Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının geliştirilmesine yardımcı olmak istiyorsanız lütfen <link ns6:href=\"https://wiki.mageia.org/en/Documentation_team\">Belgelendirme Ekibi</link> ile irtibat kurun."
+"It was written by volunteers in their free time. Please contact <link ns6:"
+"href=\"https://wiki.mageia.org/en/Documentation_team\">Documentation Team</"
+"link>, if you would like to help improve this manual."
+msgstr ""
+"Gönüllüler tarafından boş zamanlarında yazılmıştır. Bu el kitabının "
+"geliştirilmesine yardımcı olmak istiyorsanız lütfen <link ns6:href=\"https://"
+"wiki.mageia.org/en/Documentation_team\">Belgelendirme Ekibi</link> ile "
+"irtibat kurun."
 
 #. type: Content of: <article><info><cover><para><note>
 #: en/DrakLive-cover.xml:31 en/DrakLive.xml:6 en/DrakX-cover.xml:37
@@ -1585,10 +1849,13 @@ msgstr "<note>"
 #: en/DrakLive-cover.xml:32 en/DrakLive.xml:7 en/DrakX-cover.xml:38
 #: en/DrakX.xml:7
 msgid ""
-"No one will see all the installer screens that you see in this manual. Which"
-" screens you will see, depends on your hardware and the choices you make "
+"No one will see all the installer screens that you see in this manual. Which "
+"screens you will see, depends on your hardware and the choices you make "
 "while installing."
-msgstr "Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse görmeyecektir. Göreceğiniz ekranlar donanımınıza ve kurulum sırasındaki seçimlerinize bağlıdır."
+msgstr ""
+"Bu el kitabındaki kurulum aracı ekranlarının tümünü hiç kimse görmeyecektir. "
+"Göreceğiniz ekranlar donanımınıza ve kurulum sırasındaki seçimlerinize "
+"bağlıdır."
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:35 en/DrakLive.xml:10 en/DrakX-cover.xml:41
@@ -1616,31 +1883,37 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Tebrikler"
 
-#.  Started by marja on 2012 03 29
-#.  NEEDS TO BE WRITTEN AND THEN REVIEWED!
-#.  marja - 2012-04-24 added screenshot and text
+#.  Started by marja on 2012 03 29 
+#.  NEEDS TO BE WRITTEN AND THEN REVIEWED! 
+#.  marja - 2012-04-24 added screenshot and text 
 #.  same day, added "s" to "sytems"
 #. type: Content of: <section><mediaobject>
 #: en/exitInstall.xml:14
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-exitInstall.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"exitInstall-im1\"> </imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/exitInstall.xml:21
 msgid ""
-"You have finished installing and configuring "
-"<application>Mageia</application> and it is now safe to remove the "
-"installation medium and reboot your computer."
-msgstr "<application>Mageia</application> kurulumunu ve yapılandırmasını bitirdiniz. Şimdi güvenle kurulum ortamını çıkartarak bilgisayarınızı yeniden başlatabilirsiniz."
+"You have finished installing and configuring <application>Mageia</"
+"application> and it is now safe to remove the installation medium and reboot "
+"your computer."
+msgstr ""
+"<application>Mageia</application> kurulumunu ve yapılandırmasını bitirdiniz. "
+"Şimdi güvenle kurulum ortamını çıkartarak bilgisayarınızı yeniden "
+"başlatabilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/exitInstall.xml:25
 msgid ""
-"After reboot, in the bootloader screen, you can choose between the operating"
-" systems on your computer (if you have more than one)."
+"After reboot, in the bootloader screen, you can choose between the operating "
+"systems on your computer (if you have more than one)."
 msgstr ""
 "Yeniden başlatmadan sonra, önyükleme ekranında, bilgisayarınızdaki (birden "
 "fazla varsa) işletim sistemleri arasında seçim yapabilirsiniz."
@@ -1650,7 +1923,9 @@ msgstr ""
 msgid ""
 "If you didn't adjust the settings for the bootloader, your Mageia install "
 "will be automatically selected and started."
-msgstr "Önyükleyici ayarlarını yapmadıysanız, Mageia kurulumunuz kendiliğinden seçilecek ve başlatılacaktır."
+msgstr ""
+"Önyükleyici ayarlarını yapmadıysanız, Mageia kurulumunuz kendiliğinden "
+"seçilecek ve başlatılacaktır."
 
 #. type: Content of: <section><para>
 #: en/exitInstall.xml:31
@@ -1662,30 +1937,32 @@ msgstr "Tadını çıkarın!"
 msgid ""
 "Visit www.mageia.org if you have any questions or want to contribute to "
 "Mageia"
-msgstr "Herhangi bir sorunuz varsa veya Mageia' ya katkıda bulunmak istiyorsanız www.mageia.org adresini ziyaret edin"
+msgstr ""
+"Herhangi bir sorunuz varsa veya Mageia' ya katkıda bulunmak istiyorsanız www."
+"mageia.org adresini ziyaret edin"
 
 #. type: Content of: <section><info><title>
 #: en/formatPartitions.xml:4
 msgid "Formatting"
 msgstr "Biçimlendirme"
 
-#.  Made by marja on 2012 03 29
-#.  NEEDS TO BE REVIEWED!
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1
+#.  Made by marja on 2012 03 29 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-24 added emphasis tags in formatPartitions-pa1 
 #. type: Content of: <section><mediaobject>
 #: en/formatPartitions.xml:18
 msgid ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" "
-"fileref=\"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id"
-"=\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
-"condition='live'> <imagedata revision=\"1\" fileref=\"live-"
-"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id=\"live-"
-"formatPartitions-im1\"> </imagedata> </imageobject>"
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
+"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
+"</imagedata> </imageobject>"
 msgstr ""
-"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\""
-"dx2-formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id"
-"=\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
+"<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
+"formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
+"\"formatPartitions-im1\"> </imagedata> </imageobject> <imageobject "
 "condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
 "png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
 "</imagedata> </imageobject>"
@@ -1703,14 +1980,17 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:34
 msgid "Usually at least the partitions DrakX selected, need to be formatted"
-msgstr "Genellikle, DrakX tarafından seçilen bölümlerin biçimlendirilmesi gerekir"
+msgstr ""
+"Genellikle, DrakX tarafından seçilen bölümlerin biçimlendirilmesi gerekir"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:37
 msgid ""
 "Click on <guibutton>Advanced</guibutton> to choose partitions you want to "
 "check for so called <emphasis>bad blocks</emphasis>"
-msgstr "<emphasis>hatalı bloklar</emphasis> için sınanmasını istediğiniz bölümleri seçmek için <guibutton>Gelişmiş</guibutton> düğmesine tıklayın"
+msgstr ""
+"<emphasis>hatalı bloklar</emphasis> için sınanmasını istediğiniz bölümleri "
+"seçmek için <guibutton>Gelişmiş</guibutton> düğmesine tıklayın"
 
 #. type: Content of: <section><tip><para>
 #: en/formatPartitions.xml:42
@@ -1719,14 +1999,21 @@ msgid ""
 "<guibutton>Previous</guibutton>, again on <guibutton>Previous</guibutton> "
 "and then on <guibutton>Custom</guibutton> to get back to the main screen.  "
 "In that screen you can choose to view what is in your partitions."
-msgstr "Doğru seçimi yaptığınızdan emin değilseniz, <guibutton>Geri</guibutton> ve yine <guibutton>Geri</guibutton> düğmesine tıklayabilir ve sonra <guibutton>Kişisel</guibutton> düğmesine tıklayarak ana ekranı geri getirebilirsiniz.  Bu ekranda disk bölümlerinizde neyin olduğunu görüntülemeyi seçebilirsiniz."
+msgstr ""
+"Doğru seçimi yaptığınızdan emin değilseniz, <guibutton>Geri</guibutton> ve "
+"yine <guibutton>Geri</guibutton> düğmesine tıklayabilir ve sonra "
+"<guibutton>Kişisel</guibutton> düğmesine tıklayarak ana ekranı geri "
+"getirebilirsiniz.  Bu ekranda disk bölümlerinizde neyin olduğunu "
+"görüntülemeyi seçebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:49
 msgid ""
-"When you are confident about the selection, click on "
-"<guibutton>Next</guibutton> to continue."
-msgstr "Seçimi hakkında emin olduğunuzda devam etmek için <guibutton>İleri</guibutton> düğmesini tıklayın."
+"When you are confident about the selection, click on <guibutton>Next</"
+"guibutton> to continue."
+msgstr ""
+"Seçimi hakkında emin olduğunuzda devam etmek için <guibutton>İleri</"
+"guibutton> düğmesini tıklayın."
 
 #. type: Content of: <section><info><title>
 #: en/installer.xml:17
@@ -1739,14 +2026,19 @@ 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 "
 "possible."
-msgstr "İster GNU/Linux ile yeni tanışan isterse deneyimli bir kullanıcı olun, Mageia kurulum aracı kurulumu veya yükseltmeyi mümkün olan en kolay şekilde yapmanıza yardımcı olmak için tasarlanmıştır."
+msgstr ""
+"İster GNU/Linux ile yeni tanışan isterse deneyimli bir kullanıcı olun, "
+"Mageia kurulum aracı kurulumu veya yükseltmeyi mümkün olan en kolay şekilde "
+"yapmanıza yardımcı olmak için tasarlanmıştır."
 
 #. type: Content of: <section><para>
 #: en/installer.xml:28
 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 "İ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."
+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
@@ -1763,22 +2055,27 @@ msgstr "<placeholder type=\"info\" id=\"0\"/>"
 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:"
-msgstr "Burada bir Mageia DVD kullanıldığında öntanımlı karşılama ekranları bulunmaktadır. İlki eski sistemi ikincisi ise UEFI sistemi göstermektedir:"
+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>"
+"<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><mediaobject>
 #: en/installer.xml:49
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:54
@@ -1791,14 +2088,19 @@ msgstr "İlk ekranda bazı kişisel seçenekler ayarlanabilir:"
 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 (sadece eski sistemlerde) tuşuna basarak (sadece kurulumda görüntülenecek olan ve sonradan bir başkasının sistem için ayarlanabileceği) dili seçebilirsiniz"
+msgstr ""
+"F2 (sadece eski sistemlerde) tuşuna basarak (sadece kurulumda görüntülenecek "
+"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
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:71
@@ -1809,38 +2111,49 @@ msgstr "Ok tuşlarını kullanarak dili seçin ve Enter tuşuna basın."
 #: en/installer.xml:74
 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</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware "
-"Detection Tool</guilabel>."
-msgstr "Mesela burada, bir ÇalışanCD/DVD kullanımındaki Fransızca karşılama ekranı bulunmaktadır. ÇalışanCD/DVD menüsünün şunlar önermeyeceğini unutmayın: <guilabel>Sistemi Kurtar</guilabel>, <guilabel>Bellek Sınaması</guilabel> ve <guilabel>Donanım Algılama Aracı</guilabel>."
+"Note that the Live DVD/CD menu does not propose: <guilabel>Rescue System</"
+"guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware Detection "
+"Tool</guilabel>."
+msgstr ""
+"Mesela burada, bir ÇalışanCD/DVD kullanımındaki Fransızca karşılama ekranı "
+"bulunmaktadır. ÇalışanCD/DVD menüsünün şunlar önermeyeceğini unutmayın: "
+"<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>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:91
-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."
+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
 msgid ""
-"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:102
 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 "Bazı çekirdek seceneklerini eski kipte <emphasis role=\"bold\">F6</emphasis> tuşuna veya UEFI kipte <emphasis role=\"bold\">e</emphasis> tuşuna basarak ekleyebilirsiniz."
+"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 ""
+"Bazı çekirdek seceneklerini eski kipte <emphasis role=\"bold\">F6</emphasis> "
+"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
@@ -1848,7 +2161,10 @@ 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 "Kurulum başarısız olursa, ek seçeneklerden birini kullanarak yeniden 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:"
+msgstr ""
+"Kurulum başarısız olursa, ek seçeneklerden birini kullanarak yeniden "
+"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
@@ -1860,28 +2176,37 @@ msgstr "- Öntanımlı, öntanımlı seçeneklerden hiçbirinde değişiklik yap
 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."
+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
 msgid ""
 "- No ACPI (Advanced Configuration and Power Interface), power management "
 "isn't taken into account."
-msgstr "- ACPI (Gelişmiş Yapılandırma ve Güç Arabirimi) Yok, güç yönetimi hesaba alınmaz."
+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
 msgid ""
 "- No Local APIC (Local Advanced Programmable Interrupt Controller), it is "
 "about CPU interruptions, select this option if you are asked for."
-msgstr "- Yerel APIC (Yerel Gelişmiş Programlanabilir Kesme Denetleyicisi) Yok, bu seçenek işlemci kesmeleri ile ilgili olup sizden istendiğinde seçin."
+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
 msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
-msgstr "Bu girdilerden birini seçerseniz, seçtiğiniz girdi <guilabel>Önyükleme Seçenekleri</guilabel> satırında görüntülenen öntanımlı seçenekleri değiştirir."
+msgstr ""
+"Bu girdilerden birini seçerseniz, seçtiğiniz girdi <guilabel>Önyükleme "
+"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
@@ -1889,19 +2214,26 @@ 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 "Bazı Mageia yayımlarında, F6 ile seçilen girdiler <guilabel>Önyükleme Seçenekleri</guilabel> satırında görüntülenmeyebilir; ancak aslında uygulanmaktadırlar."
+msgstr ""
+"Bazı Mageia yayımlarında, F6 ile seçilen girdiler <guilabel>Önyükleme "
+"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
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:140
 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)."
+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
@@ -1909,14 +2241,19 @@ msgid ""
 "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 tuşuna basarak daha fazla seçeneğe ulaşabilirsiniz. Bunlardan birini ok 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."
+msgstr ""
+"F1 tuşuna basarak daha fazla seçeneğe ulaşabilirsiniz. Bunlardan birini ok "
+"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
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:157
@@ -1925,14 +2262,20 @@ msgid ""
 "<guilabel>Return to Boot Options</guilabel> to go back to the options list. "
 "These options can by added by hand in the <guilabel>Boot options</guilabel> "
 "line."
-msgstr "Açılış resmi ile ilgili ayrıntılı görünüm. Esc tuşuna basarak veya <guilabel>Önyükleme Seçeneklerine Dön</guilabel> seçimi ile seçenekler listesine dönün. Bu seçenekler <guilabel>Önyükleme seçenekleri</guilabel> satırına elle eklenebilir."
+msgstr ""
+"Açılış resmi ile ilgili ayrıntılı görünüm. Esc tuşuna basarak veya "
+"<guilabel>Önyükleme Seçeneklerine Dön</guilabel> seçimi ile seçenekler "
+"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
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" 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
@@ -1943,26 +2286,35 @@ msgstr "Yardım, F2 tuşu ile seçilen dile çevrilmiştir."
 #: en/installer.xml:177
 msgid ""
 "For more information about kernel options on legacy and UEFI systems, see: "
-"<link "
-"ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
-msgstr "Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi için: <link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+"<link ns2:href=\"https://wiki.mageia.org/en/How_to_set_up_kernel_options"
+"\">https://wiki.mageia.org/en/How_to_set_up_kernel_options</link>"
+msgstr ""
+"Eski ve UEFI sistemlerde çekirdek seçenekleri ile ilgili daha fazla bilgi "
+"için: <link ns2:href=\"https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options\">https://wiki.mageia.org/en/"
+"How_to_set_up_kernel_options</link>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:180
 msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
 "Installation CD (Boot.iso or Boot-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:"
+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
 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-"
-"based Installation CD, see <link "
-"ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">the Mageia "
-"Wiki</link>"
-msgstr "Dilin değiştirilmesine izin vermez, erişilebilir seçenekler ekranda tanımlanmıştır. Bir Kablolu Ağ-temelli Kurulum CDsini kullanmak hakkında daha fazla bilgi için <link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia Wiki</link>sine bakın"
+"based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
+"iso_install\">the Mageia Wiki</link>"
+msgstr ""
+"Dilin değiştirilmesine izin vermez, erişilebilir seçenekler ekranda "
+"tanımlanmıştır. Bir Kablolu Ağ-temelli Kurulum CDsini kullanmak hakkında "
+"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
@@ -1972,9 +2324,11 @@ 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>"
+"<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><info><title>
 #: en/installer.xml:200
@@ -1984,24 +2338,29 @@ msgstr "Kurulum adımları"
 #. type: Content of: <section><section><para>
 #: en/installer.xml:203
 msgid ""
-"The install process is divided into a number of steps, which can be followed"
-" on the side panel of the screen."
-msgstr "Kurulum işlemi, ekranın yanındaki panelden takip edilebilen bir kaç adıma bölünmüştür."
+"The install process is divided into a number of steps, which can be followed "
+"on the side panel of the screen."
+msgstr ""
+"Kurulum işlemi, ekranın yanındaki panelden takip edilebilen bir kaç adıma "
+"bölünmüştür."
 
 #. type: Content of: <section><section><para>
 #: en/installer.xml:206
 msgid ""
-"Each step has one or more screens which may also have "
-"<guibutton>Advanced</guibutton> buttons with extra, less commonly required, "
-"options."
-msgstr "Her adım, az gerek duyulan seçenekler için <guibutton>Gelişmiş</guibutton> düğmesini içerebilen bir veya bir kaç ekrana sahiptir."
+"Each step has one or more screens which may also have <guibutton>Advanced</"
+"guibutton> buttons with extra, less commonly required, options."
+msgstr ""
+"Her adım, az gerek duyulan seçenekler için <guibutton>Gelişmiş</guibutton> "
+"düğmesini içerebilen bir veya bir kaç ekrana sahiptir."
 
 #. type: Content of: <section><section><para>
 #: en/installer.xml:210
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
-msgstr "Çoğu ekran, geçerli adım için açıklamalar içeren <guibutton>Yardım</guibutton> düğmesine sahiptir."
+msgstr ""
+"Çoğu ekran, geçerli adım için açıklamalar içeren <guibutton>Yardım</"
+"guibutton> düğmesine sahiptir."
 
 #. type: Content of: <section><section><note><para>
 #: en/installer.xml:214
@@ -2011,10 +2370,19 @@ msgid ""
 "partition has been formatted or updates have started to be installed, your "
 "computer is no longer in the same state and rebooting it could very well "
 "leave you with an unusable system. If in spite of this you are very sure "
-"rebooting is what you want, go to a text terminal by pressing the three keys"
-" <guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
+"rebooting is what you want, go to a text terminal by pressing the three keys "
+"<guibutton>Alt Ctrl F2</guibutton> at the same time. After that, press "
 "<guibutton>Alt Ctrl Delete</guibutton> simultaneously to reboot."
-msgstr "Kurulum sırasında kurulumu durdurmak isterseniz, bilgisayarı yeniden başlatmak mümkündür; ancak bunu yapmadan önce iki kez düşünün. Bir disk bölümü biçimlendirilmişse veya güncellemeler kurulmaya başlanmışsa, bilgisayarınız aynı durumda olmayacaktır ve yeniden başlatmak sizi kullanılamaz durumda bir sistemle baş başa bırakabilir. Buna rağmen bilgisayarı yeniden başlatmak konusunda eminseniz; <guibutton>Alt Ctrl F2</guibutton> tuşlarına birlikte basarak bir metin uçbirimine gidin. Bundan sonra yeniden başlatmak için <guibutton>Alt Ctrl Delete</guibutton> tuşlarına aynı anda basın."
+msgstr ""
+"Kurulum sırasında kurulumu durdurmak isterseniz, bilgisayarı yeniden "
+"başlatmak mümkündür; ancak bunu yapmadan önce iki kez düşünün. Bir disk "
+"bölümü biçimlendirilmişse veya güncellemeler kurulmaya başlanmışsa, "
+"bilgisayarınız aynı durumda olmayacaktır ve yeniden başlatmak sizi "
+"kullanılamaz durumda bir sistemle baş başa bırakabilir. Buna rağmen "
+"bilgisayarı yeniden başlatmak konusunda eminseniz; <guibutton>Alt Ctrl F2</"
+"guibutton> tuşlarına birlikte basarak bir metin uçbirimine gidin. Bundan "
+"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
@@ -2032,7 +2400,10 @@ 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 "
 "resolution by typing <code>vgalo</code> at the prompt."
-msgstr "İlk ekrandan sonra dil seçimi ekranına erişemediniz. Bu durum bazı ekran kartlarında ve eski sistemlerde ortaya çıkabilir. Komut satırında <code>vgalo</code> yazarak düşük çözünürlük kullanmayı deneyin."
+msgstr ""
+"İlk ekrandan sonra dil seçimi ekranına erişemediniz. Bu durum bazı ekran "
+"kartlarında ve eski sistemlerde ortaya çıkabilir. Komut satırında "
+"<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
@@ -2040,9 +2411,14 @@ 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 "
 "ESC at the first welcome screen and confirm with ENTER. You will be "
-"presented with a black screen with the word \"boot:\". Type \"text\" and hit"
-" ENTER. Now continue with the installation in text mode."
-msgstr "Donanım çok eskiyse, grafiksel bir kurulum mümkün olmayabilir. Bu durumda metin tabanlı kurulumu denemelisiniz. Bunu kullanmak için, ilk karşılama ekranında ESC tuşuna basın ve ENTER tuşuna basarak eylemi onaylayın. \"boot:\" 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."
+"presented with a black screen with the word \"boot:\". Type \"text\" and hit "
+"ENTER. Now continue with the installation in text mode."
+msgstr ""
+"Donanım çok eskiyse, grafiksel bir kurulum mümkün olmayabilir. Bu durumda "
+"metin tabanlı kurulumu denemelisiniz. Bunu kullanmak için, ilk karşılama "
+"ekranında ESC tuşuna basın ve ENTER tuşuna basarak eylemi onaylayın. \"boot:"
+"\" 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
@@ -2057,7 +2433,12 @@ msgid ""
 "hardware may be bypassed and dealt with later. To try this, type "
 "<code>noauto</code> at the prompt. This option may also be combined with "
 "other options as necessary."
-msgstr "Kurulum sırasında sistem donmuş ise donanım algılaması işleminde bir sorundan kaynaklanabilir. Bu durumda donanımın kendiliğinden algılanması işlemi atlanabilir ve sonraya bırakılabilir. Bunu denemek için komut satırında <code>noauto</code> yazın. Bu seçenek gerekli olduğunda diğer seçeneklerle birlikte kullanılabilir."
+msgstr ""
+"Kurulum sırasında sistem donmuş ise donanım algılaması işleminde bir "
+"sorundan kaynaklanabilir. Bu durumda donanımın kendiliğinden algılanması "
+"işlemi atlanabilir ve sonraya bırakılabilir. Bunu denemek için komut "
+"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
@@ -2069,9 +2450,13 @@ msgstr "RAM sorunu"
 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 "
-"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. "
-"e.g. <code>mem=256M</code> would specify 256MB of RAM."
-msgstr "Bunlara nadir gereksinim olur; ama bazı durumlarda donanım erişilebilir RAM' İ yanlış bildirebilir. Bunu elle ayarlamak için <code>mem=xxxM</code> parametresini kullanabilirsiniz. Buradaki xxx RAM' in doğru boyutunu ifade etmelidir. Mesela <code>mem=256M</code> 256MB RAM' i ifade eder."
+"<code>mem=xxxM</code> parameter, where xxx is the correct amount of RAM. e."
+"g. <code>mem=256M</code> would specify 256MB of RAM."
+msgstr ""
+"Bunlara nadir gereksinim olur; ama bazı durumlarda donanım erişilebilir RAM' "
+"İ yanlış bildirebilir. Bunu elle ayarlamak için <code>mem=xxxM</code> "
+"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
@@ -2084,39 +2469,43 @@ 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 "
 "on this disc. To go back to a basic disk, see the Microsoft documentation: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-"
-"us/library/cc776315.aspx\">http://msdn.microsoft.com/en-"
-"us/library/cc776315.aspx</link>."
-msgstr "Eğer Microsoft Windows üzerinde sabit diskinizi \"temel\" biçimden \"dinamik\" biçime çevirdiyseniz, Mageia kuramazsınız. Temel diske geri dönmek için, Microsoft belgelerine bakınız: <link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
+"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+msgstr ""
+"Eğer Microsoft Windows üzerinde sabit diskinizi \"temel\" biçimden \"dinamik"
+"\" biçime çevirdiyseniz, Mageia kuramazsınız. Temel diske geri dönmek için, "
+"Microsoft belgelerine bakınız: <link ns2:href=\"http://msdn.microsoft.com/en-"
+"us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/library/cc776315."
+"aspx</link>."
 
 #. type: Content of: <section><info><title>
 #: en/installUpdates.xml:3
 msgid "Updates"
 msgstr "Güncellemeler"
 
-#.  Made by marja on 2012 03 30
-#.  NEEDS TO BE REVIEWED!
-#.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook"
-#. xmlns:ns5="http://www.w3.org/1999/xhtml"
-#. xmlns:ns42="http://www.w3.org/1998/Math/MathML"
-#. xmlns:ns4="http://www.w3.org/1999/xlink"
-#. xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore
-#. correct html filename
-#.  marja, 2012-04-24 added screenshot
+#.  Made by marja on 2012 03 30 
+#.  NEEDS TO BE REVIEWED! 
+#.  marja 20120418 removed xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns42="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/1999/xlink" xmlns:ns3="http://www.w3.org/2000/svg"" from section tag, trying to restore correct html filename
+#.  marja, 2012-04-24 added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </imageobject>"
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-installUpdates.png\" "
+"format=\"PNG\" align=\"center\" xml:id=\"installUpdates-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:19
 msgid ""
 "Since this version of <application>Mageia</application> was released, some "
 "packages will have been updated or improved."
-msgstr "<application>Mageia</application>nın bu sürümü yayımlandığından beri bazı paketler güncellenmiş veya geliştirilmiş olabilir."
+msgstr ""
+"<application>Mageia</application>nın bu sürümü yayımlandığından beri bazı "
+"paketler güncellenmiş veya geliştirilmiş olabilir."
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:23
@@ -2124,7 +2513,10 @@ msgid ""
 "Choose <guilabel>yes</guilabel> if you wish to download and install them, "
 "select <guilabel>no</guilabel> if you don't want to do this now, or if you "
 "aren't connected to the Internet"
-msgstr "Bunları indirmek ve kurmak için <guilabel>evet</guilabel>' i; bunu yapmak istemiyorsanız veya İnternet' e bağlı değilseniz <guilabel>hayır</guilabel>' ı seçin."
+msgstr ""
+"Bunları indirmek ve kurmak için <guilabel>evet</guilabel>' i; bunu yapmak "
+"istemiyorsanız veya İnternet' e bağlı değilseniz <guilabel>hayır</guilabel>' "
+"ı seçin."
 
 #. type: Content of: <section><para>
 #: en/installUpdates.xml:28
@@ -2142,8 +2534,8 @@ msgid ""
 "<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
 "im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-im1\""
-" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
+"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:12
@@ -2169,68 +2561,82 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:22
 msgid ""
-"You can find another part of our documentation in <link "
-"linkend=\"https://wiki.mageia.org/en/Category:Documentation\">the Mageia "
-"wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
-"Belgelendirmemizin diğer kısımlarına <link linkend=\""
-"https://wiki.mageia.org/en/Category:Documentation\">Mageia Wiki</link> "
-"sayfasında bulabilirsiniz."
+"Belgelendirmemizin diğer kısımlarına <link linkend=\"https://wiki.mageia.org/"
+"en/Category:Documentation\">Mageia Wiki</link> sayfasında bulabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr "Veri Kaynağı Seçimi (Nonfree)"
 
-#.  papoteur 2013-04-11  - created
-#.  marja 2013-04-16 added screenshot + made title longer (because it was the
-#. same as for add_supplemental_media)
-#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell
-#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html
-#. filename was wrong)
+#.  papoteur 2013-04-11  - created 
+#.  marja 2013-04-16 added screenshot + made title longer (because it was the same as for add_supplemental_media)
+#.  marja 2013-04-16 s/in/during/ as suggested by Tristan Campbell 
+#. marja 2013-04-17 s/xml:id="media-selection"/xml:id="media_selection"/ (html filename was wrong)
 #. type: Content of: <section><mediaobject>
 #: en/media_selection.xml:12
 msgid ""
-"<imageobject> <imagedata align=\"center\" "
-"fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" xml:id"
-"=\"media_selection-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
+"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/media_selection.xml:18
 msgid ""
 "Here you have the list of available repositories. Not all repositories are "
-"available, according to which media you use for installing. The repositories"
-" selection determines which packages will be available for selection during "
+"available, according to which media you use for installing. The repositories "
+"selection determines which packages will be available for selection during "
 "the next steps."
-msgstr "Burada mevcut depoların listesi vardır. Kurulum için kullandığınız veri kaynağına göre bütün depolar erişilebilir değildir. Depo seçimi, ilerleyen adımlarda hangi paketleri seçebileceğinizi belirler."
+msgstr ""
+"Burada mevcut depoların listesi vardır. Kurulum için kullandığınız veri "
+"kaynağına göre bütün depolar erişilebilir değildir. Depo seçimi, ilerleyen "
+"adımlarda hangi paketleri seçebileceğinizi belirler."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:25
 msgid ""
 "The <emphasis>Core</emphasis> repository cannot be disabled as it contains "
 "the base of the distribution."
-msgstr "<emphasis>Core</emphasis> deposu devre dışı bırakılamaz; çünkü dağıtımın temel paketlerini içerir."
+msgstr ""
+"<emphasis>Core</emphasis> deposu devre dışı bırakılamaz; çünkü dağıtımın "
+"temel paketlerini içerir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:30
 msgid ""
 "The <emphasis>Nonfree</emphasis> repository includes packages that are free-"
-"of-charge, i.e. Mageia may redistribute them, but they contain closed-source"
-" software (hence the name - Nonfree). For example this repository includes "
+"of-charge, i.e. Mageia may redistribute them, but they contain closed-source "
+"software (hence the name - Nonfree). For example this repository includes "
 "nVidia and ATI graphics card proprietary drivers, firmware for various WiFi "
 "cards, etc."
-msgstr "<emphasis>Nonfree</emphasis> deposu, ücretsiz edinilebilen paketleri içerir. Mageia bunları sunabilir fakat (Nonfree isminden de anlaşılabileceği gibi) kapalı kaynak kodlu yazılımları içerir. Örneğin bu depo nVidia ve ATI ekran kartlarının müseccel sürücülerini, birçok kablosuz kart v.b. için donanım yazılımlarını içerir."
+msgstr ""
+"<emphasis>Nonfree</emphasis> deposu, ücretsiz edinilebilen paketleri içerir. "
+"Mageia bunları sunabilir fakat (Nonfree isminden de anlaşılabileceği gibi) "
+"kapalı kaynak kodlu yazılımları içerir. Örneğin bu depo nVidia ve ATI ekran "
+"kartlarının müseccel sürücülerini, birçok kablosuz kart v.b. için donanım "
+"yazılımlarını içerir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/media_selection.xml:38
 msgid ""
-"The <emphasis>Tainted</emphasis> repository includes packages released under"
-" a free license. The main criteria for placing packages in this repository "
-"is that they may infringe patents and copyright laws in some countries, e.g."
-" Multimedia codecs needed to play various audio/video files; packages needed"
-" to play commercial video DVD, etc."
-msgstr "<emphasis>Tainted</emphasis> deposu, özgür yazılım altında yayımlanmış paketleri içerir. Bu depoya paketlerin konulmasındaki temel ölçüt, bunların bazı ülkelerdeki patentler ve fikri hakları koruyan yasalarla çelişmesidir. Mesela bir çok ses/video dosyasını oynatmak için gerekli çoklu ortam kod çözücüleri, ticari video DVD oynatmak için gerekli paketler v.b."
+"The <emphasis>Tainted</emphasis> repository includes packages released under "
+"a free license. The main criteria for placing packages in this repository is "
+"that they may infringe patents and copyright laws in some countries, e.g. "
+"Multimedia codecs needed to play various audio/video files; packages needed "
+"to play commercial video DVD, etc."
+msgstr ""
+"<emphasis>Tainted</emphasis> deposu, özgür yazılım altında yayımlanmış "
+"paketleri içerir. Bu depoya paketlerin konulmasındaki temel ölçüt, bunların "
+"bazı ülkelerdeki patentler ve fikri hakları koruyan yasalarla çelişmesidir. "
+"Mesela bir çok ses/video dosyasını oynatmak için gerekli çoklu ortam kod "
+"çözücüleri, ticari video DVD oynatmak için gerekli paketler v.b."
 
 #. type: Content of: <section><info><title>
 #: en/minimal-install.xml:12
@@ -2241,16 +2647,20 @@ msgstr "En Ufak Kurulum"
 #: en/minimal-install.xml:19
 msgid ""
 "You can choose a Minimal Installation by de-selecting everything in the "
-"Package Group Selection screen, see <xref "
-"linkend=\"choosePackageGroups\"></xref>."
-msgstr "Paket Grubu Seçimi ekranında, her şeyin seçimini kaldırarak En Ufak Kurulum yapmayı seçebilirsiniz. Bkz: <xref linkend=\"choosePackageGroups\"></xref>"
+"Package Group Selection screen, see <xref linkend=\"choosePackageGroups\"></"
+"xref>."
+msgstr ""
+"Paket Grubu Seçimi ekranında, her şeyin seçimini kaldırarak En Ufak Kurulum "
+"yapmayı seçebilirsiniz. Bkz: <xref linkend=\"choosePackageGroups\"></xref>"
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:22
 msgid ""
 "If desired, you can additionally tick the \"Individual package selection\" "
 "option in the same screen."
-msgstr "İstediğiniz takdirde, ayrıca aynı ekrandaki \"Tek tek paket seçimi\" seçeneğini işaretleyebilirsiniz."
+msgstr ""
+"İstediğiniz takdirde, ayrıca aynı ekrandaki \"Tek tek paket seçimi\" "
+"seçeneğini işaretleyebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:24
@@ -2260,32 +2670,44 @@ msgid ""
 "workstation. You will probably use this option combined with the "
 "\"Individual package selection\" option mentioned above, to fine-tune your "
 "installation, see <xref linkend=\"choosePackagesTree\"></xref>."
-msgstr "En Ufak Kurulum, <application>Mageia</application>'yı bir sunucu veya özelleştirilmiş iş istasyonu gibi belirli bir amaç için kullanmak isteyenler için gereklidir. Bu seçeneği, kurulumunuzu daha iyi hale getirmek için yukarıda bahsedilen \"Tek tek paket seçimi seçeneği ile birleştirerek kullanabilirsiniz. Bkz: <xref linkend=\"choosePackagesTree\"></xref>."
+msgstr ""
+"En Ufak Kurulum, <application>Mageia</application>'yı bir sunucu veya "
+"özelleştirilmiş iş istasyonu gibi belirli bir amaç için kullanmak isteyenler "
+"için gereklidir. Bu seçeneği, kurulumunuzu daha iyi hale getirmek için "
+"yukarıda bahsedilen \"Tek tek paket seçimi seçeneği ile birleştirerek "
+"kullanabilirsiniz. Bkz: <xref linkend=\"choosePackagesTree\"></xref>."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:29
 msgid ""
 "If you choose this installation class, then the related screen will offer "
 "you a few useful extras to install, such as documentation and X."
-msgstr "Bu kurulum sınıfını seçerseniz ilgili ekran, belgelendirme ve X gibi bir kaç yararlı ek paketi kurmayı önerecektir."
+msgstr ""
+"Bu kurulum sınıfını seçerseniz ilgili ekran, belgelendirme ve X gibi bir kaç "
+"yararlı ek paketi kurmayı önerecektir."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:31
 msgid ""
 "If selected, \"With X\" will also include IceWM as lightweight desktop "
 "environment."
-msgstr "Seçilirse, \"X ile\" ayrıca hafif masaüstü ortamı olarak IceWM de içerecektir."
+msgstr ""
+"Seçilirse, \"X ile\" ayrıca hafif masaüstü ortamı olarak IceWM de "
+"içerecektir."
 
 #. type: Content of: <section><para>
 #: en/minimal-install.xml:33
 msgid ""
 "The basic documentation is provided in the form of man and info pages.  It "
-"contains the man pages from the <link "
-"xlink:href=\"http://www.tldp.org/manpages/man.html\">Linux Documentation "
-"Project</link> and the <link "
-"xlink:href=\"http://www.gnu.org/software/coreutils/manual/\">GNU "
-"coreutils</link> info pages."
-msgstr "Temel belgelendirme man ve info sayfaları şeklinde sunulmuştur.  <link xlink:href=\"http://www.tldp.org/manpages/man.html\">Linux Belgelendirme Projesi</link> man sayfaları ve <link xlink:href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> info sayfalarını içermektedir."
+"contains the man pages from the <link xlink:href=\"http://www.tldp.org/"
+"manpages/man.html\">Linux Documentation Project</link> and the <link xlink:"
+"href=\"http://www.gnu.org/software/coreutils/manual/\">GNU coreutils</link> "
+"info pages."
+msgstr ""
+"Temel belgelendirme man ve info sayfaları şeklinde sunulmuştur.  <link xlink:"
+"href=\"http://www.tldp.org/manpages/man.html\">Linux Belgelendirme Projesi</"
+"link> man sayfaları ve <link xlink:href=\"http://www.gnu.org/software/"
+"coreutils/manual/\">GNU coreutils</link> info sayfalarını içermektedir."
 
 #. type: Content of: <section><mediaobject>
 #: en/minimal-install.xml:41
@@ -2293,34 +2715,37 @@ msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
 "align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
 "</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-minimal-install.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"minimal-install-im1\"></imagedata> "
+"</imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/misc-params.xml:3
 msgid "Summary of miscellaneous parameters"
 msgstr "Çeşitli parametrelerin özeti"
 
-#.  Started by marja on 2012 03 31
-#.  NEEDS TO BE WRITTEN AND REVIEWED!
-#. marja - 2012 04 15 added some text, not much, unfortunately :(
-#. marja 2012-04-24 added screenshots
+#.  Started by marja on 2012 03 31 
+#.  NEEDS TO BE WRITTEN AND REVIEWED! 
+#. marja - 2012 04 15 added some text, not much, unfortunately :( 
+#. marja 2012-04-24 added screenshots 
 #. JohnR 2012-04-25 Added text as requested by Psec :-)
-#. marja 2012-04-24 added 2 links to other help pages
-#. marja 2012-04-24 added some text in the drakxid-configureServices and
-#.       the drakxid-miscellaneous section
-#. marja 2012-04-24 corrected "Magaia" in the last paragraph
-#. marja 2012-04-24 corrected para xml:id number in the last paragraph
-#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc.
-#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by
-#. linkend="setupBootloader"
-#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry,
-#. configureServices and SecurityLevel out to separate files
+#. marja 2012-04-24 added 2 links to other help pages 
+#. marja 2012-04-24 added some text in the drakxid-configureServices and 
+#.       the drakxid-miscellaneous section 
+#. marja 2012-04-24 corrected "Magaia" in the last paragraph 
+#. marja 2012-04-24 corrected para xml:id number in the last paragraph 
+#.  2012-05-01 marja - added You-Cheng Hsieh's section about IBus etc. 
+#.  2012-08-09 marja - replaced linkend="setupBootloaderBeginner" by linkend="setupBootloader" 
+#. 2012-12-25 marja - moved configureTimezoneUTC, selectCountry, configureServices and SecurityLevel out to separate files
 #. type: Content of: <section><mediaobject>
 #: en/misc-params.xml:33
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align=\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-summary.png\" revision=\"1\" align="
+"\"center\" format=\"PNG\" xml:id=\"summary-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:38
@@ -2329,7 +2754,11 @@ msgid ""
 "the choices you made and on the hardware DrakX detected. You can check the "
 "settings here and change them if you want after pressing "
 "<guibutton>Configure</guibutton>."
-msgstr "DrakX algıladığı donanıma ve yaptığınız seçimlere bağlı olarak sisteminizin yapılandırması için en uygun seçimleri yaptı. Ayarları burada denetleyebilir ve isterseniz <guibutton>Yapılandır</guibutton> düğmesine tıklayarak değiştirebilirsiniz."
+msgstr ""
+"DrakX algıladığı donanıma ve yaptığınız seçimlere bağlı olarak sisteminizin "
+"yapılandırması için en uygun seçimleri yaptı. Ayarları burada denetleyebilir "
+"ve isterseniz <guibutton>Yapılandır</guibutton> düğmesine tıklayarak "
+"değiştirebilirsiniz."
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:45
@@ -2345,9 +2774,12 @@ msgstr "<guilabel>Zaman Dilimi</guilabel>"
 #: en/misc-params.xml:52
 msgid ""
 "DrakX selected a time zone for you, depending on your preferred language. "
-"You can change it if needed. See also <xref "
-"linkend=\"configureTimezoneUTC\"/>"
-msgstr "DrakX tercih ettiğiniz dile bağlı olarak bir zaman dilimi seçti. Gerekirse bunu değiştirebilirsiniz. Ayrıca bakınız: <xref linkend=\"configureTimezoneUTC\"/>"
+"You can change it if needed. See also <xref linkend=\"configureTimezoneUTC\"/"
+">"
+msgstr ""
+"DrakX tercih ettiğiniz dile bağlı olarak bir zaman dilimi seçti. Gerekirse "
+"bunu değiştirebilirsiniz. Ayrıca bakınız: <xref linkend="
+"\"configureTimezoneUTC\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:58
@@ -2359,7 +2791,9 @@ msgstr "<guilabel>Ülke / Bölge</guilabel>"
 msgid ""
 "If you are not in the selected country, it is very important that you "
 "correct the setting. See <xref linkend=\"selectCountry\"/>"
-msgstr "Seçilen ülkede yaşamıyorsanız, bu ayarı düzeltmeniz çok önemlidir. Bkz: <xref linkend=\"selectCountry\"/>"
+msgstr ""
+"Seçilen ülkede yaşamıyorsanız, bu ayarı düzeltmeniz çok önemlidir. Bkz: "
+"<xref linkend=\"selectCountry\"/>"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:67
@@ -2375,7 +2809,9 @@ msgstr "DrakX önyükleyici ayarı için iyi seçimler yaptı."
 #: en/misc-params.xml:72
 msgid ""
 "Do not change anything, unless you know how to configure Grub and/or Lilo"
-msgstr "Grub ve/veya Lilo' yu nasıl yapılandıracağınızı bilmiyorsanız hiç birşeyi değiştirmeyin"
+msgstr ""
+"Grub ve/veya Lilo' yu nasıl yapılandıracağınızı bilmiyorsanız hiç birşeyi "
+"değiştirmeyin"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:75
@@ -2390,9 +2826,11 @@ msgstr "<guilabel>Kullanıcı yönetimi</guilabel>"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:83
 msgid ""
-"You can add extra users here. They will each get their own "
-"<literal>/home</literal> directories."
-msgstr "İlave kullanıcıları buraya ekleyebilirsiniz. Bu kullanıcılar kendi <literal>/home</literal> dizinlerine sahip olacaklardır."
+"You can add extra users here. They will each get their own <literal>/home</"
+"literal> directories."
+msgstr ""
+"İlave kullanıcıları buraya ekleyebilirsiniz. Bu kullanıcılar kendi <literal>/"
+"home</literal> dizinlerine sahip olacaklardır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:89
@@ -2404,14 +2842,19 @@ msgstr "<guilabel>Hizmetler</guilabel>:"
 msgid ""
 "System services refer to those small programs which run the background "
 "(daemons). This tool allows you to enable or disable certain tasks."
-msgstr "Sistem hizmetleri, arka planda çalışan küçük uygulamaları (art süreçleri) işaret eder. Bu araç belirli görevleri etkinleştirmenizi veya devre dışı bırakmanızı sağlar."
+msgstr ""
+"Sistem hizmetleri, arka planda çalışan küçük uygulamaları (art süreçleri) "
+"işaret eder. Bu araç belirli görevleri etkinleştirmenizi veya devre dışı "
+"bırakmanızı sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:95
 msgid ""
 "You should check carefully before changing anything here - a mistake may "
 "prevent your computer from operating correctly."
-msgstr "Burada bir şeyi değiştirmeden önce dikkatle denetlemelisiniz; çünkü bir hata bilgisayarınızın düzgün işlemesini engelleyebilir."
+msgstr ""
+"Burada bir şeyi değiştirmeden önce dikkatle denetlemelisiniz; çünkü bir hata "
+"bilgisayarınızın düzgün işlemesini engelleyebilir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:99
@@ -2433,7 +2876,9 @@ msgstr "<guilabel>Klavye</guilabel>:"
 msgid ""
 "This is where you setup or change your keyboard layout which will depend on "
 "your location, language or type of keyboard."
-msgstr "Burası; konumunuza, dilinize ve klavye türünüze bağlı olarak klavye düzeninizi ayarlayabileceğiniz yerdir."
+msgstr ""
+"Burası; konumunuza, dilinize ve klavye türünüze bağlı olarak klavye "
+"düzeninizi ayarlayabileceğiniz yerdir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:119
@@ -2445,7 +2890,9 @@ msgstr "<guilabel>Fare</guilabel>:"
 msgid ""
 "Here you can add or configure other pointing devices, tablets, trackballs "
 "etc."
-msgstr "Burada diğer işaretleme araçlarını, tabletleri, iztoplarını v.b. ayarlayabilirsiniz."
+msgstr ""
+"Burada diğer işaretleme araçlarını, tabletleri, iztoplarını v.b. "
+"ayarlayabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:126
@@ -2455,10 +2902,13 @@ msgstr "<guilabel>Ses kartı</guilabel>:"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:129
 msgid ""
-"The installer uses the default driver, if there is a default one. The option"
-" to select a different driver is only given when there is more than one "
+"The installer uses the default driver, if there is a default one. The option "
+"to select a different driver is only given when there is more than one "
 "driver for your card, but none of them is the default one."
-msgstr "Kurulum aracı, varsa öntanımlı sürücüyü kullanır. Farklı bir sürücü seçeneği sadece kartınız için birden fazla sürücü varsa ve bunların hiç biri öntanımlı olan değilse sunulur."
+msgstr ""
+"Kurulum aracı, varsa öntanımlı sürücüyü kullanır. Farklı bir sürücü seçeneği "
+"sadece kartınız için birden fazla sürücü varsa ve bunların hiç biri "
+"öntanımlı olan değilse sunulur."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:136
@@ -2467,9 +2917,9 @@ msgstr "<guilabel>Grafiksel arabirim</guilabel>:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:139
-msgid ""
-"This section allows you to configure your graphic card(s) and displays."
-msgstr "Bu bölüm ekran kart(lar)ınızı ve görüntüleme araçlarınızı ayarlayabilirsiniz."
+msgid "This section allows you to configure your graphic card(s) and displays."
+msgstr ""
+"Bu bölüm ekran kart(lar)ınızı ve görüntüleme araçlarınızı ayarlayabilirsiniz."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:142
@@ -2479,10 +2929,11 @@ msgstr "Daha fazla bilgi için bakınız: <xref linkend=\"configureX_chooser\"/>
 #. type: Content of: <section><section><mediaobject>
 #: en/misc-params.xml:148
 msgid ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align=\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:156
@@ -2501,14 +2952,20 @@ msgid ""
 "drivers it is better to do that after reboot, in the <application>Mageia "
 "Control Center</application>, if you have not yet enabled the Nonfree media "
 "repositories."
-msgstr "Burada ağınızı yapılandırabilirsiniz; fakat Nonfree deposunu etkinleştirmediyseniz müseccel sürücüler kullanan ağ kartları için bilgisayarı yeniden başlattıktan sonra <application>Mageia Denetim Merkezi</application>'nde ayarlamanız iyi olacaktır."
+msgstr ""
+"Burada ağınızı yapılandırabilirsiniz; fakat Nonfree deposunu "
+"etkinleştirmediyseniz müseccel sürücüler kullanan ağ kartları için "
+"bilgisayarı yeniden başlattıktan sonra <application>Mageia Denetim Merkezi</"
+"application>'nde ayarlamanız iyi olacaktır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
 #: en/misc-params.xml:171
 msgid ""
 "When you add a network card, do not forget to set your firewall to watch "
 "that interface as well."
-msgstr "Bir ağ kartı eklediğinizde güvenlik duvarının bu ara birimi izlemesini ayarlamayı unutmayın."
+msgstr ""
+"Bir ağ kartı eklediğinizde güvenlik duvarının bu ara birimi izlemesini "
+"ayarlamayı unutmayın."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:178
@@ -2521,14 +2978,19 @@ msgid ""
 "A Proxy Server acts as an intermediary between your computer and the wider "
 "internet.  This section allows you to configure your computer to utilize a "
 "proxy service."
-msgstr "Bir Vekil Sunucu, bilgisayarınız ve daha geniş İnternet arasında aracı görevi görür.  Bu bölüm, bir vekil sunucu hizmetini kullanmak için bilgisayarınızı yapılandırmanıza olanak sağlar."
+msgstr ""
+"Bir Vekil Sunucu, bilgisayarınız ve daha geniş İnternet arasında aracı "
+"görevi görür.  Bu bölüm, bir vekil sunucu hizmetini kullanmak için "
+"bilgisayarınızı yapılandırmanıza olanak sağlar."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:185
 msgid ""
-"You may need to consult your systems administrator to get the parameters you"
-" need to enter here"
-msgstr "Buraya girmeniz gereken parametreleri almak için sistem yöneticinize danışmanız gerekebilir"
+"You may need to consult your systems administrator to get the parameters you "
+"need to enter here"
+msgstr ""
+"Buraya girmeniz gereken parametreleri almak için sistem yöneticinize "
+"danışmanız gerekebilir"
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:194
@@ -2543,9 +3005,11 @@ msgstr "<guilabel>Güvenlik Düzeyi</guilabel>:"
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:202
 msgid ""
-"Here you set the Security level for your computer, in most cases the default"
-" setting (Standard) is adequate for general use."
-msgstr "Burada bilgisayarınız için Güvenlik düzeyini ayarlayabilirsiniz. Çoğu durumda öntanımlı ayar (Standart) genel kullanım için yeterlidir."
+"Here you set the Security level for your computer, in most cases the default "
+"setting (Standard) is adequate for general use."
+msgstr ""
+"Burada bilgisayarınız için Güvenlik düzeyini ayarlayabilirsiniz. Çoğu "
+"durumda öntanımlı ayar (Standart) genel kullanım için yeterlidir."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:206
@@ -2562,19 +3026,25 @@ msgstr "<guilabel>Güvenlik Duvarı</guilabel>:"
 msgid ""
 "A firewall is intended to be a barrier between your important data and the "
 "rascals out there on the internet who would compromise or steal it."
-msgstr "Güvenlik Duvarı, önemli verileriniz ile internette dolaşan ve bu verileri çalmaya uğraşan çakallar arasında duvar oluşturmaktadır."
+msgstr ""
+"Güvenlik Duvarı, önemli verileriniz ile internette dolaşan ve bu verileri "
+"çalmaya uğraşan çakallar arasında duvar oluşturmaktadır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:217
 msgid ""
 "Select the services that you wish to have access to your system. Your "
 "selections will depend on what you use your computer for."
-msgstr "Sistem erişimi istediğiniz hizmetleri seçin. Yaptığınız seçimleri için bilgisayarınızı kullanım biçimine bağlı olmalıdır."
+msgstr ""
+"Sistem erişimi istediğiniz hizmetleri seçin. Yaptığınız seçimleri için "
+"bilgisayarınızı kullanım biçimine bağlı olmalıdır."
 
 #. type: Content of: <section><section><itemizedlist><listitem><warning><para>
 #: en/misc-params.xml:222
 msgid "Bear in mind that allowing everything (no firewall) may be very risky."
-msgstr "Her şeye izin vermenin (güvenlik duvarı yok) çok riskli olabileceğini unutmayın."
+msgstr ""
+"Her şeye izin vermenin (güvenlik duvarı yok) çok riskli olabileceğini "
+"unutmayın."
 
 #. type: Content of: <section><info><title>
 #: en/reboot.xml:9
@@ -2584,8 +3054,8 @@ msgstr "Yeniden Başlat"
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
@@ -2594,8 +3064,8 @@ msgstr ""
 #: en/reboot.xml:19
 msgid ""
 "Once the bootloader has been installed, you will be prompted to halt your "
-"computer, remove the live CD and restart the computer. When you restart, you"
-" will see a succession of download progress bars. These indicate that the "
+"computer, remove the live CD and restart the computer. When you restart, you "
+"will see a succession of download progress bars. These indicate that the "
 "software media are being downloaded (see Software management)."
 msgstr ""
 "Önyükleyici kurulduğunda; bilgisayarınızı durdurmanız, çalışan CD' yi "
@@ -2609,31 +3079,38 @@ msgstr ""
 msgid ""
 "Resize <application>Windows<superscript>®</superscript></application> "
 "partition"
-msgstr "<application>Windows<superscript>®</superscript></application> disk bölümünü yeniden boyutlandır"
+msgstr ""
+"<application>Windows<superscript>®</superscript></application> disk bölümünü "
+"yeniden boyutlandır"
 
 #. type: Content of: <section><para>
 #: en/resizeFATChoose.xml:20
 msgid ""
-"You have more than one "
-"<application>Windows<superscript>®</superscript></application> partition.  "
-"Choose which one should be made smaller to make space for installing "
-"<application>Mageia</application>."
-msgstr "Birden fazla <application>Windows<superscript>®</superscript></application> disk bölümüne sahipsiniz.  Hangisinin <application>Mageia</application> kurulumu için küçültüleceğini seçin."
+"You have more than one <application>Windows<superscript>®</superscript></"
+"application> partition.  Choose which one should be made smaller to make "
+"space for installing <application>Mageia</application>."
+msgstr ""
+"Birden fazla <application>Windows<superscript>®</superscript></application> "
+"disk bölümüne sahipsiniz.  Hangisinin <application>Mageia</application> "
+"kurulumu için küçültüleceğini seçin."
 
 #. type: Content of: <section><info><title>
 #: en/securityLevel.xml:12
 msgid "Security Level"
 msgstr "Güvenlik Seviyesi"
 
-#.  2012-12-25 marja - moved this part out of misc-params.xml"
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this part out of misc-params.xml" 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/securityLevel.xml:19
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-securityLevel.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"securityLevel-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:24
@@ -2644,14 +3121,17 @@ msgstr "Güvenlik seviyenizi burada ayarlayabilirsiniz."
 #: en/securityLevel.xml:27
 msgid ""
 "Leave the default settings as they are, if you don't know what to choose."
-msgstr "Neyi seçeceğinizi bilmiyorsanız, ön tanımlı ayarları olduğu gibi bırakın."
+msgstr ""
+"Neyi seçeceğinizi bilmiyorsanız, ön tanımlı ayarları olduğu gibi bırakın."
 
 #. type: Content of: <section><para>
 #: en/securityLevel.xml:30
 msgid ""
 "After install, it will always be possible to adjust your security settings "
 "in the <guilabel>Security</guilabel> part of the Mageia Control Center."
-msgstr "Kurulumdan sonra, istediğiniz zaman güvenlik ayarlarınızı Mageia Denetim Merkezi'ndeki <guilabel>Güvenlik</guilabel> bölümünden yapabilirsiniz."
+msgstr ""
+"Kurulumdan sonra, istediğiniz zaman güvenlik ayarlarınızı Mageia Denetim "
+"Merkezi'ndeki <guilabel>Güvenlik</guilabel> bölümünden yapabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/SelectAndUseISOs2.xml:5
@@ -2723,14 +3203,19 @@ msgid ""
 "Here, a medium (plural: media) is an ISO image file that allows you to "
 "install and/or update Mageia and by extension any physical support the ISO "
 "file is copied to."
-msgstr "Burada sözü edilen ortam, Mageia'yı kurmaya ve/veya yükseltmeye olanak sağlayan bir ISO imaj dosyasıdır ve herhangi bir fiziksel desteğe bağlı olarak kopyalanan ISO dosyasıdır."
+msgstr ""
+"Burada sözü edilen ortam, Mageia'yı kurmaya ve/veya yükseltmeye olanak "
+"sağlayan bir ISO imaj dosyasıdır ve herhangi bir fiziksel desteğe bağlı "
+"olarak kopyalanan ISO dosyasıdır."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:46
 msgid ""
-"You can find them <link "
-"ns4:href=\"http://www.mageia.org/en/downloads/\">here</link>."
-msgstr "Ortamları <link ns4:href=\"http://www.mageia.org/en/downloads/\">burada</link> bulabilirsiniz."
+"You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
+"\">here</link>."
+msgstr ""
+"Ortamları <link ns4:href=\"http://www.mageia.org/en/downloads/\">burada</"
+"link> bulabilirsiniz."
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:50
@@ -2743,14 +3228,12 @@ msgstr "Klasik kurulum ortamı"
 msgid "Common features"
 msgstr "Ortak özellikler"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:57
 msgid "These ISOs use the traditional installer called drakx."
 msgstr "Bu ISO'lar drakx denilen geleneksel yükleyiciyi kullanırlar."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:62
 msgid ""
 "They are able to make a clean install or an update from previous releases."
@@ -2761,62 +3244,61 @@ msgstr "Önceki sürümden yükseltme veya temiz bir kurulum yapabilirler."
 msgid "DVD"
 msgstr "DVD"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:73
 msgid "Different media for architecture 32 or 64 bits."
 msgstr "32 veya 64 bit mimari için faklı ortamlar. "
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:77
 msgid ""
 "Some tools are available in the Welcome screen: Rescue System, Memory Test, "
 "Hardware Detection Tool."
-msgstr "Karşılama ekranında Donanım Algılama, Sistem kurtarma ve Hafıza Testi araçları mevcuttur."
+msgstr ""
+"Karşılama ekranında Donanım Algılama, Sistem kurtarma ve Hafıza Testi "
+"araçları mevcuttur."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:82
 msgid "Each DVD contains many available desktop environments and languages."
 msgstr "Her bir DVD birçok masaüstü ortamı ve dil içermektedir."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:87
 msgid ""
 "You'll be given the choice during the installation to add non free software."
-msgstr "Size, kurulum sırasında özgür olmayan yazılım eklemek için seçenek sunulacak."
+msgstr ""
+"Size, kurulum sırasında özgür olmayan yazılım eklemek için seçenek sunulacak."
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:94
 msgid "DVD dual arch"
 msgstr "DVD dual arch"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:98
 msgid ""
 "Both architectures are present on the same medium, the choice is made "
 "automatically according to the detected CPU."
-msgstr "Her iki mimari de aynı ortam üzerindedir, seçim CPU testine göre otomatik olarak yapılır."
+msgstr ""
+"Her iki mimari de aynı ortam üzerindedir, seçim CPU testine göre otomatik "
+"olarak yapılır."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:103
 msgid "Uses Xfce desktop only."
 msgstr "Yalnız Xfce masaüstü kullanılır."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:107
 msgid ""
 "Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl, "
 "pt, ru, sv, uk) TO BE CHECKED!"
-msgstr "Tüm diller mevcut değildir. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk) DİLLERİ BULUNMAKTADIR!"
+msgstr ""
+"Tüm diller mevcut değildir. (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, "
+"sv, uk) DİLLERİ BULUNMAKTADIR!"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:112
 msgid "It contains non free software."
 msgstr "Özgür olmayan yazılım içerir."
@@ -2826,38 +3308,38 @@ msgstr "Özgür olmayan yazılım içerir."
 msgid "Live media"
 msgstr "Canlı Ortam"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:126
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
-msgstr "Sabit disk üzerine kurulum yapmadan kullanılabilir, istenirse sabit disk üzerine Mageia kurulur."
+msgstr ""
+"Sabit disk üzerine kurulum yapmadan kullanılabilir, istenirse sabit disk "
+"üzerine Mageia kurulur."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:131
 msgid "Each ISO contains only one desktop environment (KDE or GNOME)."
 msgstr "Her bir ISO yalnız bir masaüstü ortamı içerir (KDE veya Gnome)."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:136 en/SelectAndUseISOs2.xml:200
 #: en/SelectAndUseISOs2.xml:218 en/SelectAndUseISOs2.xml:248
 msgid "Different media for 32 or 64 bit architectures."
 msgstr "32 veya 64 bit mimari için farklı ortamlar."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:140
 msgid ""
 "<emphasis role=\"bold\">Live ISOs can only be used to create clean "
-"installations, they cannot be used to upgrade from previous "
-"releases.</emphasis>"
-msgstr "<emphasis role=\"bold\">Canlı ISO'lar yalnız temiz bir kurulum yapmak için kullanılabilir, bir önceki sürümden yükseltme yapmak için kullanılamazlar.</emphasis>"
+"installations, they cannot be used to upgrade from previous releases.</"
+"emphasis>"
+msgstr ""
+"<emphasis role=\"bold\">Canlı ISO'lar yalnız temiz bir kurulum yapmak için "
+"kullanılabilir, bir önceki sürümden yükseltme yapmak için kullanılamazlar.</"
+"emphasis>"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:146
 msgid "They contain non free software."
 msgstr "Özgür olmayan yazılım içerirler."
@@ -2867,21 +3349,18 @@ msgstr "Özgür olmayan yazılım içerirler."
 msgid "Live CD KDE"
 msgstr "Canlı CD KDE"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:156 en/SelectAndUseISOs2.xml:192
 msgid "KDE desktop environment only."
 msgstr "Yalnız KDE masaüstü ortamı."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:160 en/SelectAndUseISOs2.xml:178
 #: en/SelectAndUseISOs2.xml:252
 msgid "English language only."
 msgstr "Yalnız İngilizce."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:164 en/SelectAndUseISOs2.xml:182
 msgid "32 bit only."
 msgstr "Sadece 32 bit."
@@ -2891,8 +3370,7 @@ msgstr "Sadece 32 bit."
 msgid "Live CD GNOME"
 msgstr "Canlı CD GNOME"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:174 en/SelectAndUseISOs2.xml:210
 msgid "GNOME desktop environment only."
 msgstr "Yalnız GNOME masaüstü ortamı."
@@ -2902,8 +3380,7 @@ msgstr "Yalnız GNOME masaüstü ortamı."
 msgid "Live DVD KDE"
 msgstr "Canlı DVD KDE"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:196 en/SelectAndUseISOs2.xml:214
 msgid "All languages are present."
 msgstr "Tüm diller mevcuttur."
@@ -2918,51 +3395,56 @@ msgstr "Canlı DVD GNOME"
 msgid "Boot-only CD media"
 msgstr "Boot-only CD ortamı"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:232
 msgid ""
-"Each one is a small image that contains no more than that which is needed to"
-" start the drakx installer and find drakx-installer-stage2 and other "
-"packages that are needed to continue and complete the install. These "
-"packages may be on the PC hard disk, on a local drive, on a local network or"
-" on the Internet."
-msgstr "Her biri, tam kurulumun devam etmesi için gereken paketler, drakx-installer-stage2 ve drakx yükleyici başlatmak için ihtiyacı olandan daha fazlasını içermeyen küçük bir imajdır."
+"Each one is a small image that contains no more than that which is needed to "
+"start the drakx installer and find drakx-installer-stage2 and other packages "
+"that are needed to continue and complete the install. These packages may be "
+"on the PC hard disk, on a local drive, on a local network or on the Internet."
+msgstr ""
+"Her biri, tam kurulumun devam etmesi için gereken paketler, drakx-installer-"
+"stage2 ve drakx yükleyici başlatmak için ihtiyacı olandan daha fazlasını "
+"içermeyen küçük bir imajdır."
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:241
 msgid ""
 "These media are very light (less than 100 MB) and are convenient when "
 "bandwidth is too low to download a full DVD, a PC without a DVD drive or a "
 "PC that can't boot from a USB stick."
-msgstr "Bu ortamlar çok hafiftir (100 MB'dan az) ve USB bellekten önyükleme yapılamadığında, bir DVD sürücüsü yoksa veya  bir DVD indirmek için bant aralığınız çok düşükse uygundur."
+msgstr ""
+"Bu ortamlar çok hafiftir (100 MB'dan az) ve USB bellekten önyükleme "
+"yapılamadığında, bir DVD sürücüsü yoksa veya  bir DVD indirmek için bant "
+"aralığınız çok düşükse uygundur."
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:258
 msgid "boot.iso"
 msgstr "boot.iso"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:262
 msgid ""
 "Contains only free software, for those people who refuse to use non-free "
 "software."
-msgstr "Özgür olmayan yazılım kullanmayı reddeden kişiler için yalnız özgür yazılım içerir."
+msgstr ""
+"Özgür olmayan yazılım kullanmayı reddeden kişiler için yalnız özgür yazılım "
+"içerir."
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:269
 msgid "boot-nonfree.iso"
 msgstr "boot-nonfree.iso"
 
-#. type: Content of:
-#. <section><section><section><section><itemizedlist><listitem><para>
+#. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:273
 msgid ""
 "Contains non-free software (mostly drivers, codecs...) for people who need "
 "it."
-msgstr "İhtiyacı olanlar için özgür olmayan yazılım (sürücüler, kodekler vs gibi) içerir."
+msgstr ""
+"İhtiyacı olanlar için özgür olmayan yazılım (sürücüler, kodekler vs gibi) "
+"içerir."
 
 #. type: Content of: <section><section><title>
 #: en/SelectAndUseISOs2.xml:282
@@ -2977,11 +3459,15 @@ msgstr "İndirme"
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:287
 msgid ""
-"Once you have chosen your ISO file, you can download it using either http or"
-" BitTorrent. In both cases, a window gives you some information, such as the"
-" mirror in use and the possibility to change if the bandwidth is to low. If "
+"Once you have chosen your ISO file, you can download it using either http or "
+"BitTorrent. In both cases, a window gives you some information, such as the "
+"mirror in use and the possibility to change if the bandwidth is to low. If "
 "http is chosen, you may also see something like"
-msgstr "ISO dosyanızı seçer seçmez dosyayı http veya BitTorrent kullanarak indirebilirsiniz. Her iki durumda da bazı bilgiler içeren bi pencere açılır. Örneğin eğer bant aralığınız çok düşükse kullanılan yansıyı değiştirme imkanı sağlamak gibi. Eğer http seçildiyse şöyle bir şey görebilirsiniz"
+msgstr ""
+"ISO dosyanızı seçer seçmez dosyayı http veya BitTorrent kullanarak "
+"indirebilirsiniz. Her iki durumda da bazı bilgiler içeren bi pencere açılır. "
+"Örneğin eğer bant aralığınız çok düşükse kullanılan yansıyı değiştirme "
+"imkanı sağlamak gibi. Eğer http seçildiyse şöyle bir şey görebilirsiniz"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:294
@@ -2992,13 +3478,13 @@ msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 #: en/SelectAndUseISOs2.xml:299
 msgid ""
 "md5sum and sha1sum are tools to check the ISO integrity. Use only one of "
-"them. Keep one of them <link linkend=\"integrity\">for further usage</link>."
-" Then this window appears:"
+"them. Keep one of them <link linkend=\"integrity\">for further usage</link>. "
+"Then this window appears:"
 msgstr ""
 "md5sum ve sha1sum araçları ISO kalıbının bütünlüğünü denetlemeye yarayan "
-"araçlardır. Sadece bunlardan birinİ kullanın. Yine birini <link linkend=\""
-"integrity\">başka zaman kullanmak üzere</link> kayıtlı tutun. Sonrasında şu "
-"pencere görüntülenir:"
+"araçlardır. Sadece bunlardan birinİ kullanın. Yine birini <link linkend="
+"\"integrity\">başka zaman kullanmak üzere</link> kayıtlı tutun. Sonrasında "
+"şu pencere görüntülenir:"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:304
@@ -3033,28 +3519,36 @@ msgstr ""
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:323
 msgid "Open a console, no need to be root, and:"
-msgstr "Konsolu açın -root olmanıza gerek yok- ve aşağıdaki komutlardan birini kullanın:"
+msgstr ""
+"Konsolu açın -root olmanıza gerek yok- ve aşağıdaki komutlardan birini "
+"kullanın:"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:325
 msgid ""
-"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum "
-"path/to/the/image/file.iso</userinput>."
-msgstr "md5sum kullanmak için: [sam@localhost]$ <userinput>md5sum imaj/dosyasının/bulunduğu/yol/dosyaadı.iso</userinput>."
+"- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
+"file.iso</userinput>."
+msgstr ""
+"md5sum kullanmak için: [sam@localhost]$ <userinput>md5sum imaj/dosyasının/"
+"bulunduğu/yol/dosyaadı.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:328
 msgid ""
-"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum "
-"path/to/the/image/file.iso</userinput>."
-msgstr "sha1sum kullanmak için: [sam@localhost]$ <userinput>sha1sum imaj/dosyasının/bulunduğu/yol/dosyaadı.iso</userinput>."
+"- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
+"image/file.iso</userinput>."
+msgstr ""
+"sha1sum kullanmak için: [sam@localhost]$ <userinput>sha1sum imaj/dosyasının/"
+"bulunduğu/yol/dosyaadı.iso</userinput>."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:331
 msgid ""
-"and compare the obtained number on your computer (you may have to wait for a"
-" while) with the number given by Mageia. Example:"
-msgstr "ve Mageia'nın verdiği numara ile bilgisayarınızda elde ettiğiniz bu numarayı (Bir süre beklemek durumunda olabilirsiniz) karşılaştırın. Örneğin:"
+"and compare the obtained number on your computer (you may have to wait for a "
+"while) with the number given by Mageia. Example:"
+msgstr ""
+"ve Mageia'nın verdiği numara ile bilgisayarınızda elde ettiğiniz bu numarayı "
+"(Bir süre beklemek durumunda olabilirsiniz) karşılaştırın. Örneğin:"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:335
@@ -3071,7 +3565,10 @@ msgstr "ISO yakma veya atma"
 msgid ""
 "The checked ISO can now be burned to a CD or DVD or dumped to a USB stick. "
 "These operations are not a simple copy and aim to make a boot-able medium."
-msgstr "Kontrol edilen ISO artık bir CD, DVD üzerine yakılabilir veya USB bellek üzerine aktarılabilir. Bu işlemler basit bir kopya değildir amaç çalıştırılabilir bir ortam yapmaktır."
+msgstr ""
+"Kontrol edilen ISO artık bir CD, DVD üzerine yakılabilir veya USB bellek "
+"üzerine aktarılabilir. Bu işlemler basit bir kopya değildir amaç "
+"çalıştırılabilir bir ortam yapmaktır."
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:352
@@ -3083,10 +3580,14 @@ msgstr "Bir CD/DVD üzerine ISO yakma"
 msgid ""
 "Use whatever burner you wish but ensure the burning device is set correctly "
 "to <emphasis role=\"bold\">burn an image</emphasis>, burn data or files is "
-"not correct. There is more information in <link "
-"ns4:href=\"https://wiki.mageia.org/en/Writing_CD_and_DVD_images\">the Mageia"
-" wiki</link>."
-msgstr "Dilediğiniz herhangi bir yakma aracını kullanın fakat yakma aygıtının bir <emphasis role=\"bold\">imaj yakmak</emphasis> için doğru ayarlandığından emin olun. Dosya veya veri olarak yakmak doğru bir işlem değildir. Daha fazla bilgi için <link ns4:href=\"https://wiki.mageia.org/en/Yakma\">buradaki Mageia wiki sayfasına</link> bakınız."
+"not correct. There is more information in <link ns4:href=\"https://wiki."
+"mageia.org/en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
+msgstr ""
+"Dilediğiniz herhangi bir yakma aracını kullanın fakat yakma aygıtının bir "
+"<emphasis role=\"bold\">imaj yakmak</emphasis> için doğru ayarlandığından "
+"emin olun. Dosya veya veri olarak yakmak doğru bir işlem değildir. Daha "
+"fazla bilgi için <link ns4:href=\"https://wiki.mageia.org/en/Yakma"
+"\">buradaki Mageia wiki sayfasına</link> bakınız."
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:361
@@ -3098,7 +3599,9 @@ msgstr "Bir USB bellek üzerine ISO atmak"
 msgid ""
 "All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick "
 "and then use it to boot and install the system."
-msgstr "Tüm Mageia ISO'ları hibrittir, bunun anlamı şudur ki onları USB belleğe atıp sistemi önyükleme ve kurulum için kullanabilirsiniz."
+msgstr ""
+"Tüm Mageia ISO'ları hibrittir, bunun anlamı şudur ki onları USB belleğe atıp "
+"sistemi önyükleme ve kurulum için kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/SelectAndUseISOs2.xml:367
@@ -3106,7 +3609,10 @@ msgid ""
 "\"dumping\" an image onto a flash device destroys any previous file-system "
 "on the device; any other data will be lost and the partition capacity will "
 "be reduced to the image size."
-msgstr "Bir flash aygıt üzerine bir imaj atma aygıt üzerindeki var olan herhangi bir dosya sistemini tahrip eder. Üzerindeki veriler silinir ve bölüm kapasitesi imaj boyutuna indirgenir."
+msgstr ""
+"Bir flash aygıt üzerine bir imaj atma aygıt üzerindeki var olan herhangi bir "
+"dosya sistemini tahrip eder. Üzerindeki veriler silinir ve bölüm kapasitesi "
+"imaj boyutuna indirgenir."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:372
@@ -3125,9 +3631,12 @@ msgstr "Mageia üzerinde bir grafiksel araç kullanarak"
 #. type: Content of: <section><section><section><section><para>
 #: en/SelectAndUseISOs2.xml:378
 msgid ""
-"You can use a graphical tool like <link "
-"ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
-msgstr "<link ns4:href=\"https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link> gibi grafiksel bir araç kullanabilirsiniz."
+"You can use a graphical tool like <link ns4:href=\"https://wiki.mageia.org/"
+"en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
+msgstr ""
+"<link ns4:href=\"https://wiki.mageia.org/en/"
+"IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link> gibi grafiksel "
+"bir araç kullanabilirsiniz."
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:382
@@ -3153,7 +3662,9 @@ msgstr ""
 msgid ""
 "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
 "Disk Imager</link>"
-msgstr "- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 Disk Imager</link>"
+msgstr ""
+"- <link ns4:href=\"http://sourceforge.net/projects/win32diskimager\">Win32 "
+"Disk Imager</link>"
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:394
@@ -3174,60 +3685,57 @@ msgstr ""
 msgid "You can also use the dd tool in a console:"
 msgstr "Ayrıca konsolda dd aracını da kullanabilirsiniz:"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:405
 msgid "Open a console"
 msgstr "Konsolu açın"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:409
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
-msgstr "<userinput>su -</userinput> komutu ile root olun (sonundaki \"-\" işareti unutmayın)"
+msgstr ""
+"<userinput>su -</userinput> komutu ile root olun (sonundaki \"-\" işareti "
+"unutmayın)"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:413
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:420
 msgid ""
 "Plug your USB stick (do not mount it, this also means do not open any "
 "application or file manager that could access or read it)"
-msgstr "USB belleği takın (bağlamayın, bu aynı zamanda herhangi bir uygulama veya belleğe erişecek,onu okuyacak dosya yöneticisinin açılmaması anlamına da gelmektedir)"
+msgstr ""
+"USB belleği takın (bağlamayın, bu aynı zamanda herhangi bir uygulama veya "
+"belleğe erişecek,onu okuyacak dosya yöneticisinin açılmaması anlamına da "
+"gelmektedir)"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:426
 msgid "Enter the command <userinput>fdisk -l</userinput>"
 msgstr "<userinput>fdisk -l</userinput> komutunu girin"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><mediaobject>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:429
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:434
 msgid ""
-"Alternatively, you can get the device name with the command "
-"<code>dmesg</code>: at end, you see the device name starting with "
-"<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:"
+"Alternatively, you can get the device name with the command <code>dmesg</"
+"code>: at end, you see the device name starting with <emphasis>sd</"
+"emphasis>, and <emphasis>sdd</emphasis> in this case:"
 msgstr ""
 "Ek olarak, aygıt adını <code>dmesg</code> kotumu ile elde edebilirsiniz: en "
 "sonda, <emphasis>sd</emphasis> ve şu durumda <emphasis>sdd</emphasis> ile "
 "başlayan aygıt adını görürsünüz:"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><screen>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><screen>
 #: en/SelectAndUseISOs2.xml:439
 #, no-wrap
 msgid ""
@@ -3252,21 +3760,16 @@ msgid ""
 msgstr ""
 "[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd\n"
 "[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000\n"
-"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, "
-"SerialNumber=3\n"
+"[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3\n"
 "[72594.770536] usb 1-1: Product: Mass Storage Device\n"
 "[72594.770537] usb 1-1: Manufacturer: JetFlash\n"
 "[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB\n"
-"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
-"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep "
-"desc says 255 microframes\n"
+"[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
+"[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes\n"
 "[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected\n"
 "[72594.772447] scsi host8: usb-storage 1-1:1.0\n"
-"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    "
-"1100 PQ: 0 ANSI: 4\n"
-"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/"
-"2.00 GiB)\n"
+"[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4\n"
+"[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)\n"
 "[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off\n"
 "[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00\n"
 "[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found\n"
@@ -3274,47 +3777,45 @@ msgstr ""
 "[72595.967251]  <emphasis>sdd</emphasis>: sdd1\n"
 "[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:460
 msgid ""
-"Find the device name for your USB stick (by its size), for example "
-"<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
+"Find the device name for your USB stick (by its size), for example <code>/"
+"dev/sdb</code> in the screenshot above, it is a 8GB USB stick."
 msgstr ""
 "USB belleğinizin (boyutundan) aygıt adını bulun. Örneğin yukarıdaki ekran "
 "görüntüsündeki 8 GB USB belleğin aygıt adı <code>/dev/sdb</code> olarak "
 "görünüyor."
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:466
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
-msgstr "Şu komutu girin: # <userinput>dd if=/iso/dosyasının/yolu of=/dev/sdX bs=1M</userinput>"
+msgstr ""
+"Şu komutu girin: # <userinput>dd if=/iso/dosyasının/yolu of=/dev/sdX bs=1M</"
+"userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:469
 msgid "Where X=your device name eg: /dev/sdc"
 msgstr "X= aygıtınızın adıdır. örn: /dev/sdc"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:471
 msgid ""
-"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso "
-"of=/dev/sdb bs=1M</userinput>"
-msgstr "Örneğin: # <userinput>dd if=/home/kullanıcıAdı/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb bs=1M</userinput>"
+"Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/"
+"dev/sdb bs=1M</userinput>"
+msgstr ""
+"Örneğin: # <userinput>dd if=/home/kullanıcıAdı/Downloads/Mageia-4-x86_64-DVD."
+"iso of=/dev/sdb bs=1M</userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:477
 msgid "Enter the command: # <userinput>sync</userinput>"
 msgstr "Şu komutu girin: # <userinput>sync</userinput>"
 
-#. type: Content of:
-#. <section><section><section><section><orderedlist><listitem><para>
+#. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:481
 msgid "Unplug your USB stick, it is done"
 msgstr "USB belleğinizi çıkartıp işlemi tamamlayın"
@@ -3324,15 +3825,18 @@ msgstr "USB belleğinizi çıkartıp işlemi tamamlayın"
 msgid "Select your Country / Region"
 msgstr "Ülke/Bölge seçin"
 
-#.  2012-12-25 marja - moved this section out of misc-params
-#.  2013-05-05 marja - added screenshot
+#.  2012-12-25 marja - moved this section out of misc-params 
+#.  2013-05-05 marja - added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectCountry.xml:21
 msgid ""
 "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </imageobject>"
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-selectCountry.png\" "
+"align=\"center\" format=\"PNG\" xml:id=\"selectCountry-im1\"></imagedata> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:27
@@ -3340,14 +3844,19 @@ msgid ""
 "Select your country or region. This is important for all kinds of settings, "
 "like the currency and wireless regulatory domain. Setting the wrong country "
 "can lead to not being able to use a Wireless network."
-msgstr "Bulunduğunuz ülke veya bölgeyi seçin. Bu işlem, para birimi ve kablosuz ağ dolaşım alanı gibi her tür ayar için önemlidir. Yanlış ülkeyi seçmek Kablosuz ağ kullanımınızı engelleyebilir."
+msgstr ""
+"Bulunduğunuz ülke veya bölgeyi seçin. Bu işlem, para birimi ve kablosuz ağ "
+"dolaşım alanı gibi her tür ayar için önemlidir. Yanlış ülkeyi seçmek "
+"Kablosuz ağ kullanımınızı engelleyebilir."
 
 #. type: Content of: <section><para>
 #: en/selectCountry.xml:32
 msgid ""
-"If your country isn't in the list, click the <guilabel>Other "
-"Countries</guilabel> button and choose your country / region there."
-msgstr "Ülkeniz listede yer almıyorsa, <guilabel>Diğer Ülkeler</guilabel> düğmesine tıklayın ve ülkenizi/bölgenizi orada seçin."
+"If your country isn't in the list, click the <guilabel>Other Countries</"
+"guilabel> button and choose your country / region there."
+msgstr ""
+"Ülkeniz listede yer almıyorsa, <guilabel>Diğer Ülkeler</guilabel> düğmesine "
+"tıklayın ve ülkenizi/bölgenizi orada seçin."
 
 #. type: Content of: <section><note><para>
 #: en/selectCountry.xml:37
@@ -3356,7 +3865,11 @@ msgid ""
 "after clicking <guibutton>OK</guibutton> it may seem a country from the "
 "first list was chosen. Please ignore this, DrakX will follow your real "
 "choice."
-msgstr "Ülkeniz sadece <guilabel>Diğer Ülkeler</guilabel> listesindeyse; <guibutton>TAMAM</guibutton> düğmesine tıkladıktan sonra ilk listeden bir ülke seçilmiş gibi görüntülenir. Lütfen bunu görmezden gelin, DrakX gerçek seçiminizi uygulayacaktır."
+msgstr ""
+"Ülkeniz sadece <guilabel>Diğer Ülkeler</guilabel> listesindeyse; "
+"<guibutton>TAMAM</guibutton> düğmesine tıkladıktan sonra ilk listeden bir "
+"ülke seçilmiş gibi görüntülenir. Lütfen bunu görmezden gelin, DrakX gerçek "
+"seçiminizi uygulayacaktır."
 
 #. type: Content of: <section><section><info><title>
 #: en/selectCountry.xml:46
@@ -3367,14 +3880,23 @@ msgstr "Girdi yöntemi:"
 #: en/selectCountry.xml:49
 msgid ""
 "In the <guilabel>Other Countries</guilabel> screen you can also select an "
-"input method (at the bottom of the list). Input methods allow users to input"
-" multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
+"input method (at the bottom of the list). Input methods allow users to input "
+"multilingual characters (Chinese, Japanese, Korean, etc). IBus is the "
 "default input method in Mageia DVDs, Africa/India and Asia/no-India Live-"
-"CDs. For Asian and African locales, IBus will be set as default input method"
-" so users should not need to configure it manually. Other input "
-"methods(SCIM, GCIN, HIME, etc) also provide similar functions and can be "
-"installed if you added HTTP/FTP media before package selection."
-msgstr "<guilabel>Diğer Ülkeler</guilabel> ekranında ayrıca bir girdi yöntemi (listenin sonunda) seçebilirsiniz. Girdi yöntemleri kullanıcıların birden çok alfabe karakterlerini (Çince, Japonca, Korece v.b.) kullanmalarını sağlar. IBus Mageia DVD' lerinde, Afrika/Hindistan ve Asya Çalışan CDlerinde yer alan ön tanımlı girdi yöntemidir. Asya veya Afrika dilleri için, IBus ön tanımlı girdi yöntemi olarak ayarlanır ve böylece kullanıcıların elle ayar yapmaları gerekmez. Diğer girdi yöntemleri (SCIM, GCIN, HIME vb.) benzer işlevler sunar ve paket seçiminden önce HTTP/FTP veri kaynağı ayarlanmışsa kurulabilirler."
+"CDs. For Asian and African locales, IBus will be set as default input method "
+"so users should not need to configure it manually. Other input methods(SCIM, "
+"GCIN, HIME, etc) also provide similar functions and can be installed if you "
+"added HTTP/FTP media before package selection."
+msgstr ""
+"<guilabel>Diğer Ülkeler</guilabel> ekranında ayrıca bir girdi yöntemi "
+"(listenin sonunda) seçebilirsiniz. Girdi yöntemleri kullanıcıların birden "
+"çok alfabe karakterlerini (Çince, Japonca, Korece v.b.) kullanmalarını "
+"sağlar. IBus Mageia DVD' lerinde, Afrika/Hindistan ve Asya Çalışan CDlerinde "
+"yer alan ön tanımlı girdi yöntemidir. Asya veya Afrika dilleri için, IBus ön "
+"tanımlı girdi yöntemi olarak ayarlanır ve böylece kullanıcıların elle ayar "
+"yapmaları gerekmez. Diğer girdi yöntemleri (SCIM, GCIN, HIME vb.) benzer "
+"işlevler sunar ve paket seçiminden önce HTTP/FTP veri kaynağı ayarlanmışsa "
+"kurulabilirler."
 
 #. type: Content of: <section><section><note><para>
 #: en/selectCountry.xml:61
@@ -3382,7 +3904,11 @@ msgid ""
 "If you missed the input method setup during installation, you can access it "
 "after you boot your installed system via \"Configure your Computer\" -&gt; "
 "\"System\", or by running localedrake as root."
-msgstr "Kurulum sırasında girdi yöntemi kurulumunu atlamışsanız, bu işleve kurduğunuz sistemi başlattıktan sonra \"Bilgisayarınızı Yapılandırın\" -&gt; \"Sistem\" yoluyla veya kök olarak localedrake aracını çalıştırarak erişebilirsiniz."
+msgstr ""
+"Kurulum sırasında girdi yöntemi kurulumunu atlamışsanız, bu işleve "
+"kurduğunuz sistemi başlattıktan sonra \"Bilgisayarınızı Yapılandırın\" -&gt; "
+"\"Sistem\" yoluyla veya kök olarak localedrake aracını çalıştırarak "
+"erişebilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/selectInstallClass.xml:21
@@ -3392,9 +3918,11 @@ msgstr "Kurulum veya Yükseltme"
 #. type: Content of: <section><mediaobject>
 #: en/selectInstallClass.xml:25
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" "
-"align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align=\"center\" format=\"PNG\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectInstallClass.png\" align="
+"\"center\" format=\"PNG\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:32
@@ -3405,7 +3933,9 @@ msgstr "Kurulum"
 #: en/selectInstallClass.xml:34
 msgid ""
 "Use this option for a fresh <application>Mageia</application> installation."
-msgstr "Bu seçeneği taze bir <application>Mageia</application> kurulumu yapmak için kullanın."
+msgstr ""
+"Bu seçeneği taze bir <application>Mageia</application> kurulumu yapmak için "
+"kullanın."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:39
@@ -3418,7 +3948,10 @@ msgid ""
 "If you have one or more <application>Mageia</application> installations on "
 "your system, the installer will allow you to upgrade one of them to the "
 "latest release."
-msgstr "Sisteminizde bir veya daha fazla <application>Mageia</application> kurulumunuz mevcutsa, kurulum aracı bunlardan birini en son sürüme yükseltmeye izin verecektir."
+msgstr ""
+"Sisteminizde bir veya daha fazla <application>Mageia</application> "
+"kurulumunuz mevcutsa, kurulum aracı bunlardan birini en son sürüme "
+"yükseltmeye izin verecektir."
 
 #. type: Content of: <section><itemizedlist><listitem><warning><para>
 #: en/selectInstallClass.xml:45
@@ -3426,31 +3959,50 @@ msgid ""
 "Only upgrading from a previous Mageia version that was <emphasis>still "
 "supported</emphasis> when this installer's version was released, has been "
 "thoroughly tested. If you want to upgrade a Mageia version that had already "
-"reached its End\tOf Life when this one was released, then it is better to do"
-" a clean install while preserving your <literal>/home</literal> partition."
-msgstr "Bu kurulum aracı sürümü yayınlandığında denenmiş olan ve <emphasis>halen desteklenen</emphasis> sadece bir önceki Mageia sürümünden yükseltme mümkündür. Bu sürümün yayınlandığı esnada Destek \tSüresinin Sonuna gelmiş olan bir Mageia sürümünden yükseltme yapmak isteseniz de <literal>/home</literal> disk bölümünü koruyarak temiz ve yeni bir kurulum yapmanız daha iyi olacaktır."
+"reached its End\tOf Life when this one was released, then it is better to do "
+"a clean install while preserving your <literal>/home</literal> partition."
+msgstr ""
+"Bu kurulum aracı sürümü yayınlandığında denenmiş olan ve <emphasis>halen "
+"desteklenen</emphasis> sadece bir önceki Mageia sürümünden yükseltme "
+"mümkündür. Bu sürümün yayınlandığı esnada Destek \tSüresinin Sonuna gelmiş "
+"olan bir Mageia sürümünden yükseltme yapmak isteseniz de <literal>/home</"
+"literal> disk bölümünü koruyarak temiz ve yeni bir kurulum yapmanız daha iyi "
+"olacaktır."
 
 #. type: Content of: <section><note><para>
 #: en/selectInstallClass.xml:56
 msgid ""
 "If during install you decide to stop the installation, it is possible to "
-"reboot, but please think twice before you do this. Once a partition has been"
-" formatted or updates have started to be installed, your computer isn't in "
+"reboot, but please think twice before you do this. Once a partition has been "
+"formatted or updates have started to be installed, your computer isn't in "
 "the same state anymore and rebooting it could very well leave you with an "
-"unusable system. If in spite of that you are very sure rebooting is what you"
-" want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
-"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl "
-"Delete</guilabel> simultaneously to reboot."
-msgstr "Kurulum sırasında kurulumu durdurmak isterseniz, bilgisayarı yeniden başlatmak mümkündür; ancak bunu yapmadan önce iki kez düşünün. Bir disk bölümü biçimlendirilmişse veya güncellemeler kurulmaya başlanmışsa, bilgisayarınız aynı durumda olmayacaktır ve yeniden başlatmak sizi kullanılamaz durumda bir sistemle baş başa bırakabilir. Buna rağmen bilgisayarı yeniden başlatmak konusunda eminseniz; <guilabel>Alt Ctrl F2</guilabel> tuşlarına birlikte basarak bir metin uçbirimine gidin. Bundan sonra yeniden başlatmak için <guilabel>Alt Ctrl Delete</guilabel>tuşlarına aynı anda basın."
+"unusable system. If in spite of that you are very sure rebooting is what you "
+"want, go to a text terminal by pressing the three keys <guilabel>Alt Ctrl "
+"F2</guilabel> at the same time. After that, press <guilabel>Alt Ctrl Delete</"
+"guilabel> simultaneously to reboot."
+msgstr ""
+"Kurulum sırasında kurulumu durdurmak isterseniz, bilgisayarı yeniden "
+"başlatmak mümkündür; ancak bunu yapmadan önce iki kez düşünün. Bir disk "
+"bölümü biçimlendirilmişse veya güncellemeler kurulmaya başlanmışsa, "
+"bilgisayarınız aynı durumda olmayacaktır ve yeniden başlatmak sizi "
+"kullanılamaz durumda bir sistemle baş başa bırakabilir. Buna rağmen "
+"bilgisayarı yeniden başlatmak konusunda eminseniz; <guilabel>Alt Ctrl F2</"
+"guilabel> tuşlarına birlikte basarak bir metin uçbirimine gidin. Bundan "
+"sonra yeniden başlatmak için <guilabel>Alt Ctrl Delete</guilabel>tuşlarına "
+"aynı anda basın."
 
 #. type: Content of: <section><tip><para>
 #: en/selectInstallClass.xml:67
 msgid ""
-"If you have discovered that you forgot to select an additional language, you"
-" can return from the \"Install or Upgrade\" screen to the language choice "
-"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do "
-"<emphasis>not</emphasis> do this later in the install."
-msgstr "Ek bir dil seçmeyi unuttuğunuzu fark ettiyseniz, \"Kurulum veya Yükseltme\" ekranından <guilabel>Alt Ctrl Home</guilabel> tuşlarına aynı anda basarak dil seçimi ekranına dönüş yapabilirsiniz. Bunu kurulumun sonraki aşamalarında yap<emphasis>ma</emphasis>yın."
+"If you have discovered that you forgot to select an additional language, you "
+"can return from the \"Install or Upgrade\" screen to the language choice "
+"screen by pressing <guilabel>Alt Ctrl Home</guilabel>. Do <emphasis>not</"
+"emphasis> do this later in the install."
+msgstr ""
+"Ek bir dil seçmeyi unuttuğunuzu fark ettiyseniz, \"Kurulum veya Yükseltme\" "
+"ekranından <guilabel>Alt Ctrl Home</guilabel> tuşlarına aynı anda basarak "
+"dil seçimi ekranına dönüş yapabilirsiniz. Bunu kurulumun sonraki "
+"aşamalarında yap<emphasis>ma</emphasis>yın."
 
 #. type: Content of: <section><info><title>
 #: en/selectKeyboardLive.xml:3
@@ -3461,18 +4013,18 @@ msgstr "Klavye Seçimi"
 #: en/selectKeyboardLive.xml:7
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
-"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> "
-"</imageobject>"
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
 msgid ""
-"You will be required to set the keyboard layout you wish to use in Mageia​​."
-" The default one is selected according to your language and timezone "
+"You will be required to set the keyboard layout you wish to use in Mageia​​. "
+"The default one is selected according to your language and timezone "
 "previously selected."
 msgstr ""
 "Mageia üzerinde kullanmak istediğiniz klavye düzenini ayarlamanız istenir. "
@@ -3489,43 +4041,58 @@ msgstr "Klavye"
 msgid ""
 "DrakX selects an appropriate keyboard for your language. If no suitable "
 "keyboard is found it will default to a US keyboard layout."
-msgstr "DrakX diliniz için uygun bir klavye seçer. Uygun bir klavye bulunamazsa ön tanımlı olan US klavye düzenini seçecektir."
+msgstr ""
+"DrakX diliniz için uygun bir klavye seçer. Uygun bir klavye bulunamazsa ön "
+"tanımlı olan US klavye düzenini seçecektir."
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboard.xml:22
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\""
-" /> </imageobject>"
-msgstr "<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png\" /> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
+"\" /> </imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:30
 msgid ""
 "Make sure that the selection is correct or choose another keyboard layout. "
-"If you don't know which layout your keyboard has, look in the specifications"
-" that came with your system, or ask the computer vendor. There may even be a"
-" label on the keyboard that identifies the layout. You can also look here: "
-"<link "
-"xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
-msgstr "Seçimin doğru olduğundan emin olun veya başka klavye düzeni seçin. Klavyenizin hangi düzene sahip olduğunu bilmiyorsanız sisteminiz ile birlikte gelen özelliklere bakın veya bilgisayar satıcınıza sorun. Klavye üzerinde düzenini gösteren bir etiket de bulunabilir. Ayrıca şuraya da bakabilirsiniz: <link xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
+"If you don't know which layout your keyboard has, look in the specifications "
+"that came with your system, or ask the computer vendor. There may even be a "
+"label on the keyboard that identifies the layout. You can also look here: "
+"<link xlink:href=\"http://en.wikipedia.org/wiki/Keyboard_layout\">en."
+"wikipedia.org/wiki/Keyboard_layout</link>"
+msgstr ""
+"Seçimin doğru olduğundan emin olun veya başka klavye düzeni seçin. "
+"Klavyenizin hangi düzene sahip olduğunu bilmiyorsanız sisteminiz ile "
+"birlikte gelen özelliklere bakın veya bilgisayar satıcınıza sorun. Klavye "
+"üzerinde düzenini gösteren bir etiket de bulunabilir. Ayrıca şuraya da "
+"bakabilirsiniz: <link xlink:href=\"http://en.wikipedia.org/wiki/"
+"Keyboard_layout\">en.wikipedia.org/wiki/Keyboard_layout</link>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:40
 msgid ""
-"If your keyboard isn't in the list shown, click on "
-"<guibutton>More</guibutton> to get a full list, and select your keyboard "
-"there."
-msgstr "Klavyeniz listede gösterilmemişse, <guibutton>Ayrıntı</guibutton> düğmesine tıklayarak tam listeye ulaşabilir ve klavyenizi oradan seçebilirsiniz."
+"If your keyboard isn't in the list shown, click on <guibutton>More</"
+"guibutton> to get a full list, and select your keyboard there."
+msgstr ""
+"Klavyeniz listede gösterilmemişse, <guibutton>Ayrıntı</guibutton> düğmesine "
+"tıklayarak tam listeye ulaşabilir ve klavyenizi oradan seçebilirsiniz."
 
 #. type: Content of: <section><itemizedlist><listitem><para><warning><para>
 #: en/selectKeyboard.xml:45
 msgid ""
 "After choosing a keyboard from the <guibutton>More</guibutton> dialog, "
-"you'll return to the first keyboard choice dialog and it will seem as though"
-" a keyboard from that screen was chosen. You can safely ignore this anomaly "
+"you'll return to the first keyboard choice dialog and it will seem as though "
+"a keyboard from that screen was chosen. You can safely ignore this anomaly "
 "and continue the installation: Your keyboard is the one you chose from the "
 "full list."
-msgstr "<guibutton>Ayrıntı</guibutton> kısmında bir klavye seçtikten sonra ilk klavye seçimi ekranına döndürülürsünüz. Burada bir klavye seçimi yapılmış gibi görünecektir. Bu hatayı güvenle yok sayabilir ve kuruluma devam edebilirsiniz: Klavyeniz. listeden seçtiğiniz klavye olarak ayarlanacaktır."
+msgstr ""
+"<guibutton>Ayrıntı</guibutton> kısmında bir klavye seçtikten sonra ilk "
+"klavye seçimi ekranına döndürülürsünüz. Burada bir klavye seçimi yapılmış "
+"gibi görünecektir. Bu hatayı güvenle yok sayabilir ve kuruluma devam "
+"edebilirsiniz: Klavyeniz. listeden seçtiğiniz klavye olarak ayarlanacaktır."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectKeyboard.xml:55
@@ -3533,7 +4100,10 @@ msgid ""
 "If you choose a keyboard based on non-Latin characters, you will see an "
 "extra dialog screen asking how you would prefer to switch between the Latin "
 "and non-Latin keyboard layouts"
-msgstr "Latin alfabesi temelli olmayan bir klavye seçerseniz ek bir ekranda Latin ve Latin temelli olmayan klavye düzenleri arasında nasıl geçiş yapmak istediğiniz sorulur."
+msgstr ""
+"Latin alfabesi temelli olmayan bir klavye seçerseniz ek bir ekranda Latin ve "
+"Latin temelli olmayan klavye düzenleri arasında nasıl geçiş yapmak "
+"istediğiniz sorulur."
 
 #. type: Content of: <section><info><title>
 #: en/selectLanguage.xml:15
@@ -3546,44 +4116,57 @@ msgid ""
 "Select your preferred language, by first expanding the list for your "
 "continent. <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."
+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:22
 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 "
-"<guibutton>Multiple languages</guibutton> button to add them now. It will be"
-" difficult to add extra language support after installation."
-msgstr "Sisteminizde kendiniz veya diğer kullanıcılar için başka dillerin de kurulu olması gerekiyorsa, bunları şimdi eklemek için <guibutton>Çoklu dil</guibutton> düğmesini kullanın. Kurulumdan sonra ek dil desteği eklemek zor olacaktır."
+"<guibutton>Multiple languages</guibutton> button to add them now. It will be "
+"difficult to add extra language support after installation."
+msgstr ""
+"Sisteminizde kendiniz veya diğer kullanıcılar için başka dillerin de kurulu "
+"olması gerekiyorsa, bunları şimdi eklemek için <guibutton>Çoklu dil</"
+"guibutton> düğmesini kullanın. Kurulumdan sonra ek dil desteği eklemek zor "
+"olacaktır."
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" "
-"fileref=\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> "
-"<imageobject condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-"
-"language.png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref=\""
-"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/>"
-" </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
 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 "
+"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 "
 "marked as chosen in the multiple languages screen ."
-msgstr "Birden çok dil seçmiş bile olsanız, bunlardan birini ilk dil ekranında tercih edilen dil olarak belirlemelisiniz. Seçtiğiniz bu dil çoklu dil ekranında da işaretli olacaktır ."
+msgstr ""
+"Birden çok dil seçmiş bile olsanız, bunlardan birini ilk dil ekranında "
+"tercih edilen dil olarak belirlemelisiniz. Seçtiğiniz bu dil çoklu dil "
+"ekranında da işaretli olacaktır ."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:46
 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 "Klavye diliniz tercih ettiğiniz dilden farklı ise klavyenizin kullandığı dili de kurmanız önerilir."
+msgstr ""
+"Klavye diliniz tercih ettiğiniz dilden farklı ise klavyenizin kullandığı "
+"dili de kurmanız önerilir."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:52
@@ -3615,38 +4198,46 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Fare seçin"
 
-#.  Made by marja on 2012 04 11
-#.  NEEDS TO BE REVIEWED!
-#.  adding some "real" text now that we know the page shows up in the right
-#. place
-#.  marja 2012-04-24 adding screenshot
+#.  Made by marja on 2012 04 11 
+#.  NEEDS TO BE REVIEWED! 
+#.  adding some "real" text now that we know the page shows up in the right place
+#.  marja 2012-04-24 adding screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
 "format=\"PNG\" > </imagedata> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" format=\"PNG\" > </imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
+"format=\"PNG\" > </imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:23
 msgid ""
 "If you are not happy with how your mouse responds, you can select a "
 "different one here."
-msgstr "Farenizin cevap verme şeklinden mutlu değilseniz, farklı bir tanesini burada seçebilirsiniz."
+msgstr ""
+"Farenizin cevap verme şeklinden mutlu değilseniz, farklı bir tanesini burada "
+"seçebilirsiniz."
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:25
 msgid ""
-"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB "
-"mice</guilabel> is a good choice."
-msgstr "Genellikle, <guilabel>Evrensel</guilabel> - <guilabel>Herhangi PS/2 &amp; USB fare</guilabel> iyi bir seçim olacaktır."
+"Usually, <guilabel>Universal</guilabel> - <guilabel>Any PS/2 and USB mice</"
+"guilabel> is a good choice."
+msgstr ""
+"Genellikle, <guilabel>Evrensel</guilabel> - <guilabel>Herhangi PS/2 &amp; "
+"USB fare</guilabel> iyi bir seçim olacaktır."
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:27
 msgid ""
 "Select <guilabel>Universal</guilabel> - <guilabel>Force evdev</guilabel> to "
 "configure the buttons that do not work on a mouse with six or more buttons."
-msgstr "Altı veya daha fazla düğmesi olan farelerde çalışmayan düğmeleri ayarlamak için <guilabel>Evrensel</guilabel> - <guilabel>evdev zorla</guilabel> seçeneğini seçin."
+msgstr ""
+"Altı veya daha fazla düğmesi olan farelerde çalışmayan düğmeleri ayarlamak "
+"için <guilabel>Evrensel</guilabel> - <guilabel>evdev zorla</guilabel> "
+"seçeneğini seçin."
 
 #. type: Content of: <section><info><title>
 #: en/setupBootloaderAddEntry.xml:5
@@ -3656,10 +4247,13 @@ msgstr "Önyükleme Menü Girdisi Ekleme veya Değiştirme"
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
 msgid ""
-"<imageobject> <imagedata revision=\"1\" "
-"fileref=\"dx2-bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" "
-"xml:id=\"bootloaderConfiguration-im1\"/> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
+"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:16 en/setupBootloader.xml:17
@@ -3672,44 +4266,60 @@ msgid ""
 "You can add an entry or modify the one you select first, by pressing the "
 "relevant button in the <emphasis>Bootloader Configuration</emphasis> screen "
 "and editing the screen that pops up on top of it."
-msgstr "<emphasis>Önyükleme Yapılandırması</emphasis> ekranında ve üstünde açılan ekranda düzenleme yaparak bir girdi ekleyebilir veya seçtiğiniz bir girdiyi değiştirebilirsiniz."
+msgstr ""
+"<emphasis>Önyükleme Yapılandırması</emphasis> ekranında ve üstünde açılan "
+"ekranda düzenleme yaparak bir girdi ekleyebilir veya seçtiğiniz bir girdiyi "
+"değiştirebilirsiniz."
 
 #. type: Content of: <section><section><note><para>
 #: en/setupBootloaderAddEntry.xml:23
 msgid ""
 "If you have chosen <code>Grub 2</code> as your bootloader, you cannot use "
 "this tool to edit entries at this step, press 'Next'. You need to manually "
-"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>"
-" instead."
-msgstr "Eğer önyükleyici olarak <code>Grub 2</code>'yi seçerseniz 'İleri' aşamasında girdileri düzenlemek için bu aracı kullanamazsınız. <code>/boot/grub2/custom.cfg</code> dosyasını elle düzenlemeniz veya yerine <code>grub-customizer</code> kullanmanız gerekiyor."
+"edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
+"instead."
+msgstr ""
+"Eğer önyükleyici olarak <code>Grub 2</code>'yi seçerseniz 'İleri' aşamasında "
+"girdileri düzenlemek için bu aracı kullanamazsınız. <code>/boot/grub2/custom."
+"cfg</code> dosyasını elle düzenlemeniz veya yerine <code>grub-customizer</"
+"code> kullanmanız gerekiyor."
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:30
 msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" "
-"fileref=\"dx2-setupBootloaderAddEntry.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry.png\"/> </imageobject>"
+"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
+"png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
+"png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:35
 msgid ""
 "Some things that can be done without any risk, are changing the label of an "
 "entry and ticking the box to make an entry the default one."
-msgstr "Risk almadan yapılabilecek bazı şeyler, bir girdinin etiketini değiştirmek ve girdiyi yanındaki kutucuğu işaretleyerek öntanımlı olarak belirlemektir."
+msgstr ""
+"Risk almadan yapılabilecek bazı şeyler, bir girdinin etiketini değiştirmek "
+"ve girdiyi yanındaki kutucuğu işaretleyerek öntanımlı olarak belirlemektir."
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:39
 msgid ""
 "You can add the proper version number of an entry, or rename it completely."
-msgstr "Bir girdinin uygun sürüm numarasını ekleyebilir veya tümüyle yeniden adlandırabilirsiniz."
+msgstr ""
+"Bir girdinin uygun sürüm numarasını ekleyebilir veya tümüyle yeniden "
+"adlandırabilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:42
 msgid ""
 "The default entry is the one the systems boots into if you don't make a "
 "choice while booting up."
-msgstr "Öntanımlı girdi, önyükleme ekranında bir seçim yapmadıysanız sistemin önyükleme yapacağı girdidir."
+msgstr ""
+"Öntanımlı girdi, önyükleme ekranında bir seçim yapmadıysanız sistemin "
+"önyükleme yapacağı girdidir."
 
 #. type: Content of: <section><section><warning><para>
 #: en/setupBootloaderAddEntry.xml:46
@@ -3730,10 +4340,9 @@ msgstr "Bir UEFI sistem ile"
 #: en/setupBootloaderAddEntry.xml:55
 msgid ""
 "In this case you are using Grub2-efi and you cannot use this tool to edit "
-"entries at this step. To do that you need to manually edit "
-"<code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code> "
-"instead. All you can do here, is to choose the default entry in the drop "
-"down list."
+"entries at this step. To do that you need to manually edit <code>/boot/grub2/"
+"custom.cfg</code> or use <code>grub-customizer</code> instead. All you can "
+"do here, is to choose the default entry in the drop down list."
 msgstr ""
 
 #. type: Content of: <section><section><para>
@@ -3747,8 +4356,8 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:66
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -3759,25 +4368,33 @@ msgstr "Önyükleyici ana seçenekleri"
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
 msgid ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" "
-"fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" "
-"format=\"PNG\"/> </imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+"imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"dx2-"
+"setupBootloader.png\" xml:id=\"setupBootloader-im1\" format=\"PNG\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:19
 msgid ""
-"If you prefer different bootloader settings to those chosen automatically by"
-" the installer, you can change them here."
-msgstr "Kurulum aracı tarafından kendiliğinden seçilenlerden farklı önyükleme ayarları tercih ediyorsanız burada değiştirebilirsiniz."
+"If you prefer different bootloader settings to those chosen automatically by "
+"the installer, you can change them here."
+msgstr ""
+"Kurulum aracı tarafından kendiliğinden seçilenlerden farklı önyükleme "
+"ayarları tercih ediyorsanız burada değiştirebilirsiniz."
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:23
 msgid ""
-"You may already have another operating system on your machine, in which case"
-" you need to decide whether to add Mageia to your existing bootloader, or "
+"You may already have another operating system on your machine, in which case "
+"you need to decide whether to add Mageia to your existing bootloader, or "
 "allow Mageia to create a new one."
-msgstr "Makinenizde bir başka işletim sistemi daha kurulu olabilir. Bu durumda mevcut önyükleyiciye Mageia' yı eklemek veya Mageia' nın yeni bir önyükleyici oluşturmasına izin vermek arasında tercih yapmalısınız."
+msgstr ""
+"Makinenizde bir başka işletim sistemi daha kurulu olabilir. Bu durumda "
+"mevcut önyükleyiciye Mageia' yı eklemek veya Mageia' nın yeni bir "
+"önyükleyici oluşturmasına izin vermek arasında tercih yapmalısınız."
 
 #. type: Content of: <section><section><tip><para>
 #: en/setupBootloader.xml:29
@@ -3803,7 +4420,9 @@ msgstr ""
 msgid ""
 "Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB "
 "legacy and Lilo."
-msgstr "Mageia, eski GRUB ve Lilo' ya ek olarak GRUB2 önyükleyiciyi de tercihe bağlı olarak sunmaktadır."
+msgstr ""
+"Mageia, eski GRUB ve Lilo' ya ek olarak GRUB2 önyükleyiciyi de tercihe bağlı "
+"olarak sunmaktadır."
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/setupBootloader.xml:48
@@ -3818,7 +4437,9 @@ msgstr ""
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
-msgstr "Buradaki en iyi çözüm kurulum sırasında Özet sayfasından erişebileceğiniz GRUB2 önyükleyiciyi kullanmak olacaktır."
+msgstr ""
+"Buradaki en iyi çözüm kurulum sırasında Özet sayfasından erişebileceğiniz "
+"GRUB2 önyükleyiciyi kullanmak olacaktır."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/setupBootloader.xml:61
@@ -3829,41 +4450,54 @@ msgstr "Mevcut bir önyükleyiciyi kullanmak"
 #: en/setupBootloader.xml:65
 msgid ""
 "If you decide to use an existing bootloader then you will need to remember "
-"to STOP at the summary page during the installation and click the Bootloader"
-" <guibutton>Configure</guibutton> button, which will allow you to change the"
-" bootloader install location."
-msgstr "Mevcut bir önyükleyiciyi kullanmaya karar verirseniz kurulum sırasında Özet sayfasında DURMALI ve önyükleyici kurulum konumunu değiştirmenizi sağlayan Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine basmalısınız."
+"to STOP at the summary page during the installation and click the Bootloader "
+"<guibutton>Configure</guibutton> button, which will allow you to change the "
+"bootloader install location."
+msgstr ""
+"Mevcut bir önyükleyiciyi kullanmaya karar verirseniz kurulum sırasında Özet "
+"sayfasında DURMALI ve önyükleyici kurulum konumunu değiştirmenizi sağlayan "
+"Önyükleyici <guibutton>Yapılandır</guibutton> düğmesine basmalısınız."
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:71
 msgid ""
-"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR."
-" You must select the root partition that you chose during the partitioning "
+"Do not select a device e.g.\"sda\", or you will overwrite your existing MBR. "
+"You must select the root partition that you chose during the partitioning "
 "phase earlier, e.g. sda7."
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:76
 msgid "To be clear, sda is a device, sda7 is a partition on that device."
-msgstr "Açık olmak gerekirse, sda bir aygıt ve sda7 ise o aygıt üzerindeki bir bölümdür."
+msgstr ""
+"Açık olmak gerekirse, sda bir aygıt ve sda7 ise o aygıt üzerindeki bir "
+"bölümdür."
 
 #. type: Content of: <section><section><section><tip><para>
 #: en/setupBootloader.xml:80
 msgid ""
 "Go to tty2 with Ctrl+Alt+F2 and type <literal>df</literal> to check where "
-"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to"
-" the installer screen."
-msgstr "Ctrl+Alt+F2 ile tty2 terminaline gidin ve <literal>/</literal> (kök) bölümün nerede olduğunu denetlemek için <literal>df</literal> komutunu çalıştırın. Ctrl+Alt+F7 sizi kurulum ekranına döndürür."
+"your <literal>/</literal> (root) partition is. Ctrl+Alt+F7 takes you back to "
+"the installer screen."
+msgstr ""
+"Ctrl+Alt+F2 ile tty2 terminaline gidin ve <literal>/</literal> (kök) bölümün "
+"nerede olduğunu denetlemek için <literal>df</literal> komutunu çalıştırın. "
+"Ctrl+Alt+F7 sizi kurulum ekranına döndürür."
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:86
 msgid ""
 "The exact procedure for adding your Mageia system to an existing bootloader "
 "is beyond the scope of this help, however in most cases it will involve "
-"running the relevant bootloader installation program which should detect and"
-" add it automatically. See the documentation for the operating system in "
+"running the relevant bootloader installation program which should detect and "
+"add it automatically. See the documentation for the operating system in "
 "question."
-msgstr "Mageia sisteminizi mevcut bir önyükleyiciye eklemek için gerekli tam süreç, bu yardımını hedeflerinin ötesindedir. Ancak yine de bir çok durumda ilgili önyükleme kurulum uygulamasını çalıştırmak onu algılayabilir ve kendiliğinden ekleyebilir. Sorularınız için işletim sisteminin belgelerine bakın."
+msgstr ""
+"Mageia sisteminizi mevcut bir önyükleyiciye eklemek için gerekli tam süreç, "
+"bu yardımını hedeflerinin ötesindedir. Ancak yine de bir çok durumda ilgili "
+"önyükleme kurulum uygulamasını çalıştırmak onu algılayabilir ve "
+"kendiliğinden ekleyebilir. Sorularınız için işletim sisteminin belgelerine "
+"bakın."
 
 #. type: Content of: <section><section><section><info><title>
 #: en/setupBootloader.xml:96
@@ -3874,10 +4508,14 @@ msgstr "Önyükleyici gelişmiş seçenekleri"
 #: en/setupBootloader.xml:100
 msgid ""
 "If you have very limited disk space for the <literal>/</literal> partition "
-"that contains <literal>/tmp</literal>, click on "
-"<guibutton>Advanced</guibutton> and check the box for <guilabel>Clean /tmp "
-"at each boot</guilabel>. This helps to maintain some free space."
-msgstr "<literal>/tmp</literal> içeren <literal>/</literal> bölümü için kısıtlı alanınız varsa, <guibutton>Gelişmiş</guibutton> düğmesine tıklayarak <guilabel>Her açılışta /tmp temizle</guilabel> kutusunu işaretleyin. Böylece biraz boş alan kazanmanız mümkün olur."
+"that contains <literal>/tmp</literal>, click on <guibutton>Advanced</"
+"guibutton> and check the box for <guilabel>Clean /tmp at each boot</"
+"guilabel>. This helps to maintain some free space."
+msgstr ""
+"<literal>/tmp</literal> içeren <literal>/</literal> bölümü için kısıtlı "
+"alanınız varsa, <guibutton>Gelişmiş</guibutton> düğmesine tıklayarak "
+"<guilabel>Her açılışta /tmp temizle</guilabel> kutusunu işaretleyin. Böylece "
+"biraz boş alan kazanmanız mümkün olur."
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:111
@@ -3889,19 +4527,19 @@ msgstr ""
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:115
 msgid ""
-"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-setupBootloader2.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:120
 msgid ""
 "If Mageia is the first system installed on your computer, the installer "
-"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi)."
-" If there was already UEFI operating systems previously installed on your "
-"computer (Windows 8 for example), the Mageia installer detected the existing"
-" ESP created by Windows and added grub2-efi. Although it is possible to have"
-" several ESPs, only one is advised and enough whatever the number of "
+"created an ESP (EFI System Partition) to receive the bootloader (Grub2-efi). "
+"If there was already UEFI operating systems previously installed on your "
+"computer (Windows 8 for example), the Mageia installer detected the existing "
+"ESP created by Windows and added grub2-efi. Although it is possible to have "
+"several ESPs, only one is advised and enough whatever the number of "
 "operating systems you have."
 msgstr ""
 
@@ -3915,38 +4553,42 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "SCSI Kur"
 
-#.  Made by marja on 2012 04 02
-#.  NEEDS TO BE REVIEWED!
-#.  JohnR - edited 2012-03-03
-#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's
-#. comment ;-)
-#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented.
-#.  marja 2012-04-24 added screenshot
-#.  marja 2012-04-25 replacing John's version 1.6 because that one was based
-#. on the
-#.        Mdv doc instead of on our setupSCSI file
+#.  Made by marja on 2012 04 02 
+#.  NEEDS TO BE REVIEWED! 
+#.  JohnR - edited 2012-03-03 
+#.  SimonNZG has reviewed 2012-04-03 (changed editted to edited in JohnR's comment ;-) 
+#.  barjac has re-reviewed and made some minor tweaks. Revisions incremented. 
+#.  marja 2012-04-24 added screenshot 
+#.  marja 2012-04-25 replacing John's version 1.6 because that one was based on the
+#.        Mdv doc instead of on our setupSCSI file 
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> "
-"</imageobject>"
-msgstr "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format=\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-setupSCSI.png\" format="
+"\"PNG\" align=\"center\" xml:id=\"setupSCSI-im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:32
 msgid ""
-"DrakX usually detects hard disks correctly. With some older SCSI controllers"
-" it may be unable to determine the correct drivers to use and subsequently "
+"DrakX usually detects hard disks correctly. With some older SCSI controllers "
+"it may be unable to determine the correct drivers to use and subsequently "
 "fail to recognise the drive."
-msgstr "DrakX genellikle sabit diskleri doğru olarak algılar. Bazı eski SCSI denetleyicileri söz konusu olduğunda kullanılacak doğru sürücüleri belirlemekte başarısız olabilir ve diski algılayamayabilir."
+msgstr ""
+"DrakX genellikle sabit diskleri doğru olarak algılar. Bazı eski SCSI "
+"denetleyicileri söz konusu olduğunda kullanılacak doğru sürücüleri "
+"belirlemekte başarısız olabilir ve diski algılayamayabilir."
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:36
 msgid ""
 "If this happens, you will need to manually tell Drakx which SCSI drive(s) "
 "you have."
-msgstr "Bu durum gerçekleşirse, Drakx' e hangi SCSI disklerinizin olduğunu elle belirtmeniz gerekecektir."
+msgstr ""
+"Bu durum gerçekleşirse, Drakx' e hangi SCSI disklerinizin olduğunu elle "
+"belirtmeniz gerekecektir."
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:39
@@ -3958,13 +4600,15 @@ msgstr "DrakX bundan sonra diskleri doğru olarak yapılandırabilecektir."
 msgid "Sound Configuration"
 msgstr "Ses Yapılandırması"
 
-#.  Started by marja on 2013-12-07
+#.  Started by marja on 2013-12-07 
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
 "format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-soundConfig.png\" revision=\"1\" "
+"format=\"PNG\" xml:id=\"soundConfig-im1\" /> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:23
@@ -3972,7 +4616,9 @@ msgid ""
 "In this screen the name of the driver that the installer chose for your "
 "sound card is given, which will be the default driver if we have a default "
 "one."
-msgstr "Bu ekranda kurulum aracının ses kartınız için seçtiği ve varsa öntanımlı sürücünün ismi sunulur."
+msgstr ""
+"Bu ekranda kurulum aracının ses kartınız için seçtiği ve varsa öntanımlı "
+"sürücünün ismi sunulur."
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:27
@@ -3982,16 +4628,24 @@ msgid ""
 "this tool via MCC (Mageia Control Center), by choosing the "
 "<guilabel>Hardware</guilabel> tab and clicking on <guilabel>Sound "
 "Configuration</guilabel> at the top right of the screen."
-msgstr "Öntanımlı sürücünün sorunsuz çalışması gerekir. Ancak, yüklendikten sonra sorunla karşılaşırsanız, <command>draksound</command> komutunu çalıştırın veya bu aracı MDD (Mageia Denetim Merkezi) <guilabel>Donanım</guilabel> sekmesinde ekranın sağ üst köşesindeki <guilabel>Ses Yapılandırması</guilabel> seçeneğini tıklayarak çalıştırın."
+msgstr ""
+"Öntanımlı sürücünün sorunsuz çalışması gerekir. Ancak, yüklendikten sonra "
+"sorunla karşılaşırsanız, <command>draksound</command> komutunu çalıştırın "
+"veya bu aracı MDD (Mageia Denetim Merkezi) <guilabel>Donanım</guilabel> "
+"sekmesinde ekranın sağ üst köşesindeki <guilabel>Ses Yapılandırması</"
+"guilabel> seçeneğini tıklayarak çalıştırın."
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:33
 msgid ""
 "Then, in the draksound or \"Sound Configuration\" tool screen, click on "
-"<guibutton>Advanced</guibutton> and then on "
-"<guibutton>Troubleshooting</guibutton> to find very useful advice about how "
-"to solve the problem."
-msgstr "Sonra, draksound' da veya \"Ses Yapılandırması\" araç ekranında, <guibutton>Gelişmiş</guibutton> düğmesine ve ondan sonra da <guibutton>Sorun giderme</guibutton> düğmesine tıklayarak sorunu çözmek için kullanışlı önerileri bulabilirsiniz."
+"<guibutton>Advanced</guibutton> and then on <guibutton>Troubleshooting</"
+"guibutton> to find very useful advice about how to solve the problem."
+msgstr ""
+"Sonra, draksound' da veya \"Ses Yapılandırması\" araç ekranında, "
+"<guibutton>Gelişmiş</guibutton> düğmesine ve ondan sonra da <guibutton>Sorun "
+"giderme</guibutton> düğmesine tıklayarak sorunu çözmek için kullanışlı "
+"önerileri bulabilirsiniz."
 
 #. type: Content of: <section><section><info><title>
 #: en/soundConfig.xml:41
@@ -4004,35 +4658,39 @@ msgid ""
 "Clicking <guibutton>Advanced</guibutton> in this screen, during install, is "
 "useful if there is no default driver and there are several drivers "
 "available, but you think the installer selected the wrong one."
-msgstr "Kurulum sırasında bu ekranda <guibutton>Gelişmiş</guibutton> düğmesine tıklamak öntanımlı bir sürücü yoksa ve erişilebilir başka sürücüler mevcutsa ve de kurulum aracının yanlış olanı seçtiğini düşünüyorsanız yararlıdır."
+msgstr ""
+"Kurulum sırasında bu ekranda <guibutton>Gelişmiş</guibutton> düğmesine "
+"tıklamak öntanımlı bir sürücü yoksa ve erişilebilir başka sürücüler mevcutsa "
+"ve de kurulum aracının yanlış olanı seçtiğini düşünüyorsanız yararlıdır."
 
 #. type: Content of: <section><section><para>
 #: en/soundConfig.xml:49
 msgid ""
 "In that case you can select a different driver after clicking on "
 "<guibutton>Let me pick any driver</guibutton>."
-msgstr "Bu durumda <guibutton>Herhangi bir sürücü seçmeme izin ver</guibutton> düğmesine tıkladığınızda farklı bir sürücü seçebilirsiniz."
+msgstr ""
+"Bu durumda <guibutton>Herhangi bir sürücü seçmeme izin ver</guibutton> "
+"düğmesine tıkladığınızda farklı bir sürücü seçebilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/takeOverHdConfirm.xml:4
 msgid "Confirm hard disk to be formatted"
 msgstr "Biçimlendirilecek sabit diski onaylayın"
 
-#.  Made by marja on 2012 04 03
-#.  test comment - johnr
+#.  Made by marja on 2012 04 03 
+#.  test comment - johnr 
 #.  2012-04-24 marja - replaced "if you are not sure you selected the correct
-#.     hard disk." with "if you are not sure about your choice", because I'm
-#. sure I
-#.     saw this help screen when I had only one HD
-#.  2013-05-05 marja added screenshot
+#.     hard disk." with "if you are not sure about your choice", because I'm sure I
+#.     saw this help screen when I had only one HD 
+#.  2013-05-05 marja added screenshot 
 #. type: Content of: <section><mediaobject>
 #: en/takeOverHdConfirm.xml:19
 msgid ""
-"<imageobject condition='live'> <imagedata fileref=\"live-"
-"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> "
-"</imageobject> <imageobject condition='classical'> <imagedata "
-"fileref=\"dx2-takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" "
-"></imagedata> </imageobject>"
+"<imageobject condition='live'> <imagedata fileref=\"live-takeOverHdConfirm."
+"png\" format=\"PNG\" align=\"center\" ></imagedata> </imageobject> "
+"<imageobject condition='classical'> <imagedata fileref=\"dx2-"
+"takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
@@ -4040,14 +4698,17 @@ msgstr ""
 msgid ""
 "Click on <guibutton>Previous</guibutton> if you are not sure about your "
 "choice."
-msgstr "Seçiminizden emin değilseniz <guibutton>Geri</guibutton> düğmesine tıklayın."
+msgstr ""
+"Seçiminizden emin değilseniz <guibutton>Geri</guibutton> düğmesine tıklayın."
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:30
 msgid ""
-"Click on <guibutton>Next</guibutton> if you are sure and want to erase every"
-" partition, every operating system and all data on that hard disk."
-msgstr "Eminseniz ve her disk bölümünü, her işletim sistemini ve sabit diskteki tümü veriyi silmeyi istiyorsanız <guibutton>İleri</guibutton>' yi tıklayın."
+"Click on <guibutton>Next</guibutton> if you are sure and want to erase every "
+"partition, every operating system and all data on that hard disk."
+msgstr ""
+"Eminseniz ve her disk bölümünü, her işletim sistemini ve sabit diskteki tümü "
+"veriyi silmeyi istiyorsanız <guibutton>İleri</guibutton>' yi tıklayın."
 
 #. type: Content of: <section><info><title>
 #: en/testing.xml:9
@@ -4123,8 +4784,7 @@ msgstr ""
 
 #. type: Content of: <section><section><section><remark>
 #: en/testing.xml:66
-msgid ""
-"The configuration settings you made here are kept for the installation."
+msgid "The configuration settings you made here are kept for the installation."
 msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
@@ -4135,8 +4795,8 @@ msgstr ""
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
 msgid ""
-"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 msgstr ""
 
 #. type: Content of: <section><section><section><para>
@@ -4144,9 +4804,8 @@ msgstr ""
 msgid ""
 "To launch the installation of Mageia LiveCD or Live DVD to the hard disc or "
 "SSD drive, simply click on the icon \"Install on Hard Disk\". You will get "
-"this screen, and then the \"<link "
-"linkend=\"doPartitionDisks\">Partitioning</link> step\" as for the direct "
-"installation."
+"this screen, and then the \"<link linkend=\"doPartitionDisks\">Partitioning</"
+"link> step\" as for the direct installation."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -4165,34 +4824,52 @@ msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia also gives you the "
 "possibility to uninstall. This is not true for every operating system."
-msgstr "Mageia ihtiyaçlarınıza cevap vermediyse veya düzgün kurulamıyorsa yahut da sadece ondan kurtulmak istiyorsanız; bu sizin hakkınız olup Mageia, kendisinin bilgisayardan kaldırılması olanağını da size sunar. Böyle bir şey her işletim sistemi için geçerli değildir."
+msgstr ""
+"Mageia ihtiyaçlarınıza cevap vermediyse veya düzgün kurulamıyorsa yahut da "
+"sadece ondan kurtulmak istiyorsanız; bu sizin hakkınız olup Mageia, "
+"kendisinin bilgisayardan kaldırılması olanağını da size sunar. Böyle bir şey "
+"her işletim sistemi için geçerli değildir."
 
 #. type: Content of: <section><section><para>
 #: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot your installation Mageia DVD and select "
-"Rescue system, then, Restore Windows boot loader. At the next boot, you will"
-" only have Windows with no option to choose your operating system."
-msgstr "Verilerinizi yedekledikten sonra sonra Mageia DVD' nizi yeniden başlatmada kullanın ve Sistemi Kurtar seçeneği üzerinden Windows önyükleyiciyi geri yükle seçeneğini kullanın. Bir sonraki yeniden başlatmada, işletim sistemi seçmek üzere bir menü sunulmadan sadece Windows açılacaktır."
+"Rescue system, then, Restore Windows boot loader. At the next boot, you will "
+"only have Windows with no option to choose your operating system."
+msgstr ""
+"Verilerinizi yedekledikten sonra sonra Mageia DVD' nizi yeniden başlatmada "
+"kullanın ve Sistemi Kurtar seçeneği üzerinden Windows önyükleyiciyi geri "
+"yükle seçeneğini kullanın. Bir sonraki yeniden başlatmada, işletim sistemi "
+"seçmek üzere bir menü sunulmadan sadece Windows açılacaktır."
 
 #. type: Content of: <section><section><para>
 #: en/uninstall-Mageia.xml:20
 msgid ""
 "To recover the space used by Mageia partitions on Windows, click on "
-"<code>Start -> Control Panel -> Administrative Tools -> Computer Management "
-"-> Storage -> Disk Management</code> to access to the partition management. "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
 "You will recognize the Mageia partition because they are labeled "
 "<guilabel>Unknown</guilabel>, and also by their size and place in the disk. "
-"Right click on each of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
-msgstr "Windows üzerindeki Mageia disk bölümlerini geri getirmek için <code> Başlat -> Denetim Masası -> Yönetimsel Araçlar -> Bilgisayar Yönetimi -> Depolama -> Disk Yönetimi</code> üzerine tıklayarak disk bölümü yönetimine erişin. Mageia disk bölümünü <guilabel>Bilinmiyor</guilabel> olarak görerek ve diskteki konumu ile boyutundan tanırsınız. Bu disk bölümlerinden her birinin üzerinde sağ tıklayın ve <guibutton>Sil</guibutton> seçeneğini seçin. Disk alanı boşaltılacaktır."
+"Right click on each of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
+msgstr ""
+"Windows üzerindeki Mageia disk bölümlerini geri getirmek için <code> Başlat -"
+"> Denetim Masası -> Yönetimsel Araçlar -> Bilgisayar Yönetimi -> Depolama -> "
+"Disk Yönetimi</code> üzerine tıklayarak disk bölümü yönetimine erişin. "
+"Mageia disk bölümünü <guilabel>Bilinmiyor</guilabel> olarak görerek ve "
+"diskteki konumu ile boyutundan tanırsınız. Bu disk bölümlerinden her birinin "
+"üzerinde sağ tıklayın ve <guibutton>Sil</guibutton> seçeneğini seçin. Disk "
+"alanı boşaltılacaktır."
 
 #. type: Content of: <section><section><para>
 #: en/uninstall-Mageia.xml:28
 msgid ""
 "If you are using Windows XP, you can create a new partition and format it "
 "(FAT32 or NTFS). It will get a partition letter."
-msgstr "Windows XP kullanıyorsanız, yeni bir disk bölümü oluşturarak (FAT32 veya NTFS biçiminde) biçimlendirebilirsiniz. Disk bölümü harfini daha sonra alacaktır."
+msgstr ""
+"Windows XP kullanıyorsanız, yeni bir disk bölümü oluşturarak (FAT32 veya "
+"NTFS biçiminde) biçimlendirebilirsiniz. Disk bölümü harfini daha sonra "
+"alacaktır."
 
 #. type: Content of: <section><section><para>
 #: en/uninstall-Mageia.xml:31
@@ -4200,9 +4877,15 @@ msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
 "existing partition that is at the left of the freed space.  There are other "
 "partitioning tools that can be used, such as gparted, available for both "
-"windows and linux. As always, when changing partitions, be very careful, and"
-" make sure all important things have been backed up."
-msgstr "Vista veya 7 kullanıyorsanız, bir ihtimal daha var. Boş disk alanının solunda bulunan mevcut disk bölümünü uzatabilirsiniz. Daha başka disk bölümlendirme araçları, mesela hem windows hem de linux altında kullanılabilen gparted gibi, mevcuttur. Her zamanki gibi, disk bölümlerini değiştirirken çok dikkatli olun ve önemli her şeyi yedeklediğinizden emin olun."
+"windows and linux. As always, when changing partitions, be very careful, and "
+"make sure all important things have been backed up."
+msgstr ""
+"Vista veya 7 kullanıyorsanız, bir ihtimal daha var. Boş disk alanının "
+"solunda bulunan mevcut disk bölümünü uzatabilirsiniz. Daha başka disk "
+"bölümlendirme araçları, mesela hem windows hem de linux altında "
+"kullanılabilen gparted gibi, mevcuttur. Her zamanki gibi, disk bölümlerini "
+"değiştirirken çok dikkatli olun ve önemli her şeyi yedeklediğinizden emin "
+"olun."
 
 #. type: Content of: <section><info><title>
 #: en/unused.xml:9
@@ -4212,17 +4895,17 @@ msgstr ""
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
 msgid ""
-"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" "
-"format=\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
 msgid ""
 "In this step, the installer looks for unused locales packages and unused "
-"hardware packages. Then it proposes you to delete them. It is a good idea to"
-" accept, except if you prepare an installation which has to run on different"
-" hardware."
+"hardware packages. Then it proposes you to delete them. It is a good idea to "
+"accept, except if you prepare an installation which has to run on different "
+"hardware."
 msgstr ""
 
 #. type: Content of: <section><mediaobject>
@@ -4235,6 +4918,6 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/unused.xml:30
 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."
+"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 ""
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index b83c11f2..15a96d4a 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-01-24 10:17+0200\n"
+"POT-Creation-Date: 2016-02-10 16:29+0200\n"
 "PO-Revision-Date: 2016-01-24 10:47+0200\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -89,8 +89,8 @@ msgstr "Нотатки щодо випуску"
 #: en/acceptLicense.xml:70
 msgid ""
 "Important information are given about this release of <application>Mageia</"
-"application> and are accessible clicking on the <guibutton>Release "
-"Notes</guibutton> button."
+"application> and are accessible clicking on the <guibutton>Release Notes</"
+"guibutton> button."
 msgstr ""
 "Щоб ознайомитися із важливою інформацією щодо поточного випуску "
 "<application>Mageia</application>, натисніть кнопку <guibutton>Нотатки щодо "
@@ -4252,11 +4252,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/selectLanguage.xml:29
+#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata format=\"PNG\" fileref=\"live-language.png\"/"
-"> </imageobject>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 msgstr ""
 "<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
 "\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
diff --git a/docs/mcc-help/ca.po b/docs/mcc-help/ca.po
index 75d467a4..26478483 100644
--- a/docs/mcc-help/ca.po
+++ b/docs/mcc-help/ca.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2016-01-19 11:25+0000\n"
 "Last-Translator: davidochobits <davidochobits@openmailbox.org>\n"
 "Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -845,7 +845,95 @@ msgstr ""
 "xarxa el convida a fer-ho i li dóna informació al respecte."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Activa l'entrada automàtica per entrar automàticament"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Podeu iniciar aquesta eina des de la línia d'ordres, escrivint <emphasis "
+"role=\"bold\">drakauth</emphasis> com a root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Aquesta eina<placeholder type=\"footnote\" id=\"0\"/> li permet connectar-se "
+"al mateix usuari, si el seu entorn / escriptori, sense demanar cap "
+"contrasenya. Es diu autoconnexió. Això és generalment una bona idea quan "
+"només hi ha un usuari que utilitzi la màquina. "
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Es troba sota la pestanya <emphasis role=\"bold\">Arrencada</emphasis> al "
+"centre de control de Mageia amb l'etiqueta \"Configuració d'inici de sessió "
+"automàtic per iniciar sessió automàticament\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Els botons de la interfície són bastant òbvies:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Marqueu <guibutton>Inicia l'entorn gràfic quan el sistema s'inicia</"
+"guibutton>, si voleu que el sistema X Windows s'executi després de "
+"reiniciar. Si no és així, el sistema s'iniciarà en mode text. No obstant "
+"això, serà possible iniciar la interfície gràfica manualment. Això es pot "
+"fer amb el llançament de 'startx' o 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la primera casella està activada, les dues opcions estaran disponibles, "
+"marqueu qualsevol <guibutton>No, no vull autoconnexió</guibutton>, si voleu "
+"que el sistema per continuar ha de preguntar a l'usuari per connectar (i la "
+"contrasenya) o seleccionar <guibutton>Sí, vull autoconnexió amb aquest "
+"(usuari, escriptori)</guibutton>, si cal. En aquest cas, també és necessari "
+"per proveir el <guibutton>nom per defecte</guibutton> i "
+"l'<guibutton>escriptori per defecte</guibutton>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configura el sistema d'arrencada"
 
@@ -855,20 +943,20 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr ""
 
@@ -882,9 +970,10 @@ msgstr ""
 "role=\"bold\">drakboot --boot</emphasis> com a root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -893,16 +982,17 @@ msgstr ""
 "contrasenya, l'arrencada per defecte, etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Es troba sota l'etiqueta d'arrancada al centre de control de Mageia amb el "
 "nom \"Estableix el sistema d'arrancada\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -911,15 +1001,16 @@ msgstr ""
 "modificació d'alguns ajusts poden evitar que el vostre equip s'iniciï de nou!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "En la primera part, anomenada <guilabel>Gestor d'arrancada</guilabel>, es "
 "pot triar el <guibutton>Gestor d'arrancada que es vol utilitzar</guibutton>, "
@@ -930,12 +1021,21 @@ msgstr ""
 "qualsevol modificació pot evitar que la màquina arrenqui."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "A la segona part, anomenada <guilabel>Opcions principals</guilabel>, pot "
@@ -946,7 +1046,7 @@ msgstr ""
 "cop que passi el temps de demora."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -955,18 +1055,18 @@ msgstr ""
 "possible establir una contrasenya."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "El botó <guibutton>Avançat</guibutton> dóna algunes opcions addicionals."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Habilita ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -979,19 +1079,19 @@ msgstr ""
 "el vostre maquinari funciona amb ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Habilita SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1000,14 +1100,14 @@ msgstr ""
 "processador dual i habilitarà SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1020,20 +1120,33 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "A la pantalla <guibutton>Següent</guibutton>, es pot veure la llista de "
 "totes les entrades disponibles en el moment de l'arrencada. L'entrada per "
@@ -1044,13 +1157,13 @@ msgstr ""
 "Grub o modificar una existent. Cal estar familiaritzat amb Lilo o Grub per "
 "poder utilitzar aquestes eines."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1060,8 +1173,8 @@ msgstr ""
 "vulgueu que es mostri al menú. Coincideix amb l'ordre \"title\" del Grub. "
 "Per exemple: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1069,8 +1182,8 @@ msgstr ""
 "La <guilabel>Imatge</guilabel> conté el nom del nucli. Coincideix amb "
 "l'ordre de Grub \"kernel\". Per exemple /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1079,8 +1192,9 @@ msgstr ""
 "s'emmagatzemaran els nuclis. Coincideix amb l'ordre de Grub \"root\". Per "
 "exemple (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1088,8 +1202,8 @@ msgstr ""
 "El camp <guilabel>Annexar</guilabel> conté les opcions que han de donar-se "
 "al nucli en l'arrencada."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1097,8 +1211,8 @@ msgstr ""
 "Si la casella <guilabel>Defecte</guilabel> està marcada, Grub arrencarà "
 "aquesta entrada per defecte."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1106,90 +1220,57 @@ msgid ""
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Activa l'entrada automàtica per entrar automàticament"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr ""
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Podeu iniciar aquesta eina des de la línia d'ordres, escrivint <emphasis "
-"role=\"bold\">drakboot</emphasis> com a root. "
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Aquesta eina<placeholder type=\"footnote\" id=\"0\"/> li permet connectar-se "
-"al mateix usuari, si el seu entorn / escriptori, sense demanar cap "
-"contrasenya. Es diu autoconnexió. Això és generalment una bona idea quan "
-"només hi ha un usuari que utilitzi la màquina. "
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Es troba sota la pestanya <emphasis role=\"bold\">Arrencada</emphasis> al "
-"centre de control de Mageia amb l'etiqueta \"Configuració d'inici de sessió "
-"automàtic per iniciar sessió automàticament\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Els botons de la interfície són bastant òbvies:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Marqueu <guibutton>Inicia l'entorn gràfic quan el sistema s'inicia</"
-"guibutton>, si voleu que el sistema X Windows s'executi després de "
-"reiniciar. Si no és així, el sistema s'iniciarà en mode text. No obstant "
-"això, serà possible iniciar la interfície gràfica manualment. Això es pot "
-"fer amb el llançament de 'startx' o 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la primera casella està activada, les dues opcions estaran disponibles, "
-"marqueu qualsevol <guibutton>No, no vull autoconnexió</guibutton>, si voleu "
-"que el sistema per continuar ha de preguntar a l'usuari per connectar (i la "
-"contrasenya) o seleccionar <guibutton>Sí, vull autoconnexió amb aquest "
-"(usuari, escriptori)</guibutton>, si cal. En aquest cas, també és necessari "
-"per proveir el <guibutton>nom per defecte</guibutton> i "
-"l'<guibutton>escriptori per defecte</guibutton>."
+"Podeu iniciar aquesta eina des de la línia d'ordres, escrivint <emphasis "
+"role=\"bold\">drakboot</emphasis> com a root. "
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2551,22 +2632,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gestiona les particions de disc"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk o diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2574,7 +2655,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2584,19 +2665,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2606,21 +2687,29 @@ msgid ""
 "the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2629,25 +2718,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6686,13 +6775,14 @@ msgstr "Configura els passos de l'arrencada"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -9067,11 +9157,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Aquesta eina<placeholder type=\"footnote\" id=\"0\"/> es troba al centre de "
+"control de Mageia, sota la pestanya Compartir Xarxa, amb l'etiqueta "
+"<guilabel>Configura les comparticions WebDAV</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -9695,3 +9789,6 @@ msgid ""
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
 msgstr ""
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/cs.po b/docs/mcc-help/cs.po
index 228ad35b..37cf7bf2 100644
--- a/docs/mcc-help/cs.po
+++ b/docs/mcc-help/cs.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-04-28 15:25+0000\n"
 "Last-Translator: Jiří Vírava <appukonrad@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
@@ -681,7 +681,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Nastavit automatické přihlášení do systému"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Tento nástroj můžete spustit z příkazového řádku zadáním <emphasis role="
+"\"bold\">drakfont</emphasis> jako superuživatel."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Nastavit způsob zavedení systému"
 
@@ -691,20 +760,20 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 #, fuzzy
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot.png"
@@ -717,68 +786,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -787,33 +864,33 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
 msgstr ""
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -826,65 +903,78 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+msgid ""
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
 "example: Mageia3."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -892,68 +982,54 @@ msgid ""
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Nastavit automatické přihlášení do systému"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr ""
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr ""
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2165,22 +2241,22 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Spravovat diskové oddíly"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk nebo diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2188,7 +2264,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2198,19 +2274,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2220,21 +2296,29 @@ msgid ""
 "the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2243,25 +2327,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6300,13 +6384,14 @@ msgstr "Nastavit kroky zavádění systému"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -8719,11 +8804,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Tento nástroj<placeholder type=\"footnote\" id=\"0\"/> se nachází v "
+"ovládacím středisku Mageia v kartě pro Sdílení v síti označené "
+"<guilabel>Nastavit sdílení pomocí WebDAV</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -9347,3 +9436,6 @@ msgid ""
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
 msgstr ""
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/de.po b/docs/mcc-help/de.po
index b4c9183a..a1f34762 100644
--- a/docs/mcc-help/de.po
+++ b/docs/mcc-help/de.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2016-01-31 19:13+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
@@ -869,7 +869,96 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Autologin einrichten zur automatischen Anmeldung"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Sie können das Programm über die Kommandozeile aufrufen, indem Sie <emphasis "
+"role=\"bold\">drakauth</emphasis> als root eingeben."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Dieses Werkzeug<placeholder type=\"footnote\" id=\"0\"/> erlaubt Ihnen das "
+"immer der gleiche Nutzer automatisch mit seiner Desktopumgebung angemeldet "
+"wird, ohne das nach einem Passwort gefragt wird. Dies ist nützlich wenn es "
+"nur einen Nutzer gibt, welcher das System verwenden möchte."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Sie finden es im Mageia Kontrollzentrum in dem <emphasis role=\"bold"
+"\">Systemstart</emphasis> Tab unter \"Autologin einrichten zur automatischen "
+"Anmeldung\""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Die Schaltflächen der Benutzeroberfläche sind ziemlich eindeutig:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Aktiviere <guibutton>Grafische Arbeitsoberfläche nach dem Hochfahren "
+"automatisch starten</guibutton>, wenn Sie möchten, dass das X Window System "
+"beim Start ausgeführt werden soll. Falls nicht, startet das System im "
+"Textmodus. Trotzdem können Sie die grafische Oberfläche manuell starten. "
+"Diese kann durch den Befehl 'startx' oder 'systemctl start dm' gestartet "
+"werden."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Wenn die erste Box ausgewählt wurde sind zwei weitere Wahlmöglichkeiten "
+"verfügbar. Entweder <guibutton>Nein, ich will kein Autologin</guibutton>, "
+"falls Sie weiterhin möchten, dass das System Sie fragt, welcher Nutzer (mit "
+"Passwort) sich anmelden möchte oder wähle <guibutton>Ja, ich will Autologin "
+"mit diesem Benutzer und dieser Arbeitsumgebung</guibutton> falls gewünscht. "
+"Im letzteren Fall müssen Sie den <guilabel>Standardbenutzer</guilabel> und "
+"die <guilabel>Standard Arbeitsumgebung</guilabel> auswählen."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Bootmanager einrichten "
 
@@ -879,23 +968,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Wenn Sie ein UEFI System nutzen sieht die Benutzeroberfläche etwas anders "
 "aus, da dort kein Bootloader ausgewählt werden kann (erste Drop-Down Liste), "
 "da nur einer verfügbar ist."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -909,9 +999,10 @@ msgstr ""
 "role=\"bold\">drakboot --boot</emphasis> als root eingeben."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -920,16 +1011,17 @@ msgstr ""
 "Passworts, das System welches standardmäßig gestartet werden soll, etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Sie finden es im Systemstart Tab im Mageia Kontrollzentrum unter "
 "'Bootmanager einrichten'"
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -939,15 +1031,16 @@ msgstr ""
 "womöglich nicht mehr bootet !"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Im ersten Teil, genannt <guilabel>Bootloader</guilabel>, können Sie den "
 "<guibutton>Zu verwendender Bootloader</guibutton> auswählen, GRUB oder Lilo "
@@ -959,12 +1052,21 @@ msgstr ""
 "eventuell dazu führen, dass das System nicht bootet."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Im zweiten Teil, <guilabel>Hauptoptionen</guilabel> genannt, können Sie die "
@@ -975,7 +1077,7 @@ msgstr ""
 "der Bootloader das Standardsystem nach der verstrichenen Wartezeit starten."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -984,19 +1086,19 @@ msgstr ""
 "es möglich ein Passwort festzulegen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Die Schaltfläche <guibutton>Fortgeschritten</guibutton> bietet einige "
 "zusätzliche Optionen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI aktivieren:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1009,12 +1111,12 @@ msgstr ""
 "die Box wenn Ihre Hardware ACPI unterstützt."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP aktivieren:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1023,7 +1125,7 @@ msgstr ""
 "für Mehrprozessorsysteme."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1032,7 +1134,7 @@ msgstr ""
 "dualen Prozessor anzeigen und SMP aktivieren."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1041,7 +1143,7 @@ msgstr ""
 "aktivieren:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1054,20 +1156,34 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Login ID</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Im nächsten Bildschirm, nachdem man auf <guibutton>Weiter</guibutton> "
 "gedrückt hat, sehen Sie eine Liste aller Booteinträge. Der Haupteintrag ist "
@@ -1079,13 +1195,13 @@ msgstr ""
 "bestehenden zu ändern. Sie sollten sich mit Lilo oder Grub auskennen, wenn "
 "Sie dieses Werkzeug nutzen."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1095,8 +1211,8 @@ msgstr ""
 "hier hinein, was im Menü angezeigt werden soll. Es stimmt mit dem Grub "
 "Kommando 'title' überein, zum Beispiel Mageia3"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1104,8 +1220,8 @@ msgstr ""
 "Das <guilabel>Abbild</guilabel> Feld enthält den Kernel Namen. Es stimmt mit "
 "dem Grub Kommando \"kernel\" überein. Zum Beispiel /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1114,8 +1230,9 @@ msgstr ""
 "Kernel befindet. Es stimmt mit dem Grub Kommando \"root\" überein. Zum "
 "Beispiel (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1123,8 +1240,8 @@ msgstr ""
 "Das <guilabel>Hinzufügen / Erweitern</guilabel> Feld enthält die Parameter, "
 "welche dem Kernel zum Booten übergeben werden."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1132,8 +1249,8 @@ msgstr ""
 "Wenn die Box <guilabel>Standard</guilabel> ausgewählt ist, wird Grub mit "
 "diesem Eintrag standardmäßig booten."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1145,91 +1262,63 @@ msgstr ""
 "Datei und ein <guilabel>Netzwerk Profil</guilabel>, siehe <xref linkend="
 "\"draknetprofile\"/>, aus der Drop-Down Liste zu wählen."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Autologin einrichten zur automatischen Anmeldung"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Login ID</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Sie können das Programm über die Kommandozeile aufrufen, indem Sie <emphasis "
-"role=\"bold\">drakboot</emphasis> als root eingeben"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Dieses Werkzeug<placeholder type=\"footnote\" id=\"0\"/> erlaubt Ihnen das "
-"immer der gleiche Nutzer automatisch mit seiner Desktopumgebung angemeldet "
-"wird, ohne das nach einem Passwort gefragt wird. Dies ist nützlich wenn es "
-"nur einen Nutzer gibt, welcher das System verwenden möchte."
+"Im separaten <guilabel>Fortgeschritten</guilabel> Bildschirm ist es möglich, "
+"den <guilabel>Video-Modus</guilabel>, eine <guilabel>Init-RamDisk</guilabel> "
+"Datei und ein <guilabel>Netzwerk Profil</guilabel>, siehe <xref linkend="
+"\"draknetprofile\"/>, aus der Drop-Down Liste zu wählen."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Sie finden es im Mageia Kontrollzentrum in dem <emphasis role=\"bold"
-"\">Systemstart</emphasis> Tab unter \"Autologin einrichten zur automatischen "
-"Anmeldung\""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Die Schaltflächen der Benutzeroberfläche sind ziemlich eindeutig:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Aktiviere <guibutton>Grafische Arbeitsoberfläche nach dem Hochfahren "
-"automatisch starten</guibutton>, wenn Sie möchten, dass das X Window System "
-"beim Start ausgeführt werden soll. Falls nicht, startet das System im "
-"Textmodus. Trotzdem können Sie die grafische Oberfläche manuell starten. "
-"Diese kann durch den Befehl 'startx' oder 'systemctl start dm' gestartet "
-"werden."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Wenn die erste Box ausgewählt wurde sind zwei weitere Wahlmöglichkeiten "
-"verfügbar. Entweder <guibutton>Nein, ich will kein Autologin</guibutton>, "
-"falls Sie weiterhin möchten, dass das System Sie fragt, welcher Nutzer (mit "
-"Passwort) sich anmelden möchte oder wähle <guibutton>Ja, ich will Autologin "
-"mit diesem Benutzer und dieser Arbeitsumgebung</guibutton> falls gewünscht. "
-"Im letzteren Fall müssen Sie den <guilabel>Standardbenutzer</guilabel> und "
-"die <guilabel>Standard Arbeitsumgebung</guilabel> auswählen."
+"Sie können das Programm über die Kommandozeile aufrufen, indem Sie <emphasis "
+"role=\"bold\">drakboot</emphasis> als root eingeben"
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2579,22 +2668,22 @@ msgstr ""
 "nicht, das Sie hierfür weitere Informationen benötigen."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Partitionen verwalten"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk oder diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2605,7 +2694,7 @@ msgstr ""
 "emphasis> als root eingeben."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2621,7 +2710,7 @@ msgstr ""
 "emphasis>, wenn Sie sich nicht sicher sind, dass Sie fortfahren möchten."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2631,12 +2720,12 @@ msgstr ""
 "bearbeiten möchten."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2654,9 +2743,17 @@ msgstr ""
 "anderen Knöpfe werden auf der rechten Seite sichtbar, nachdem Sie auf eine "
 "Partition geklickt haben."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2667,13 +2764,13 @@ msgstr ""
 "werden."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Es ist nur Möglich die Größe einer Partition auf der rechten Seite zu ändern"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2686,22 +2783,23 @@ msgstr ""
 "wenn ein leerer Platz auf dem Laufwerk ausgewählt wurde"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Sie können auch einen Einhängepunkt wählen der nicht existiert, er wird "
 "erstellt."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Beim Auswählen von <emphasis><guibutton>In den Experten-Modus wechseln</"
@@ -2709,7 +2807,7 @@ msgstr ""
 "das ändern der Bezeichnung, wie Sie im Screenshot unten sehen können."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7429,13 +7527,14 @@ msgstr "Booteinstellungen konfigurieren"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10306,10 +10405,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Dieses Werkzeug<placeholder type=\"footnote\" id=\"0\"/> befindet sich im "
 "Mageia Kontrollzentrum unter dem Reiter <emphasis role=\"bold\">System</"
@@ -11132,3 +11232,6 @@ msgstr ""
 "Möglichkeit die Änderung abzubrechen und die vorige Konfiguration zu "
 "behalten oder die Änderung zu übernehmen. In diesem Fall müssen Sie sich "
 "abmelden und neu anmelden um die neue Konfiguration zu aktivieren."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/el.po b/docs/mcc-help/el.po
index 591f606d..28ed8f34 100644
--- a/docs/mcc-help/el.po
+++ b/docs/mcc-help/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Control Center Help 4.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2016-01-09 07:45+0100\n"
 "Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
 "Language-Team: Greek <i18n-el@ml.mageia.org>\n"
@@ -868,7 +868,95 @@ msgstr ""
 "πληροφορίες για να το πραγματοποιήσετε."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Ρυθμίστε την αυτόματη σύνδεση χρήστη"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
+"πληκτρολογώντας <emphasis role= \"bold\">drakauth</emphasis> ως διαχειριστής "
+"συστήματος."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Αυτό το εργαλείο <placeholder type=\"footnote\" id=\"0\"/> σας επιτρέπει την "
+"αυτόματη σύνδεση ενός χρήστη, χωρίς να ερωτηθεί για τον κωδικό πρόσβασης. "
+"Συνήθως εξυπηρετεί όταν υπάρχει μόνο ένας χρήστης στο μηχάνημα."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Θα το βρείτε στην καρτέλα <emphasis role=\"bold\">Εκκίνηση</emphasis> στο "
+"Κέντρο Ελέγχου Mageia με την ονομασία «Ρύθμιση της αυτόματης εκκίνησης "
+"χρήστη»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Τα κουμπιά ελέγχου είναι ευνόητα:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Επιλέξτε την <guibutton>«Εκτέλεση του γραφικού περιβάλλοντος κατά την "
+"εκκίνηση του συστήματος»</guibutton>, αν επιθυμείτε την εκκίνηση του "
+"συστήματος γραφικού περιβάλλοντος X Window System κατά την εκκίνηση. "
+"Διαφορετικά, το σύστημα θα εκκινηθεί σε λειτουργία κειμένου (χωρίς γραφικό "
+"περιβάλλον). Αυτό μπορεί να πραγματοποιηθεί χειροκίνητα εκτελώντας την "
+"εντολή «startx» ή «systemctl start dm»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Αν η πρώτη επιλογή είναι επιλεγμένη, προσφέρονται άλλες δυο επιλογές· "
+"<guibutton>Όχι δεν επιθυμώ την αυτόματη σύνδεση</guibutton>, αν επιθυμείτε "
+"τη σύνδεση σε κάθε εκκίνηση με το όνομα χρήστη και τον κωδικό πρόσβασης ή "
+"επιλέξτε <guibutton>Ναι, επιθυμώ την αυτόματη σύνδεση</guibutton>. Σε αυτήν "
+"την περίπτωση, θα πρέπει να παράσχετε το προεπιλεγμένο <guilabel>Όνομα "
+"χρήστη</guilabel> και το εξ ορισμού <guilabel>Γραφικό περιβάλλον</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Ρυθμίστε την εκκίνηση του υπολογιστή"
 
@@ -878,24 +966,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Αν χρησιμοποιείτε ένα σύστημα UEFI, το περιβάλλον χρήστη είναι ελαφρώς "
-"διαφορετικό όπως ότι "
-"δεν μπορείτε να επιλέξετε το πρόγραμμα εκκίνησης (πρώτη αναπτυσσόμενη λίστα) "
-"διότι μόνο μια επιλογή είναι διαθέσιμη."
+"διαφορετικό όπως ότι δεν μπορείτε να επιλέξετε το πρόγραμμα εκκίνησης (πρώτη "
+"αναπτυσσόμενη λίστα) διότι μόνο μια επιλογή είναι διαθέσιμη."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -910,9 +998,10 @@ msgstr ""
 "διαχειριστής συστήματος."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -921,16 +1010,17 @@ msgstr ""
 "ορισμός κωδικού πρόσβασης, την προκαθορισμένη εκκίνηση, κλπ) "
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Θα το βρείτε στην καρτέλα Εκκίνηση στο Κέντρο Ελέγχου Mageia με την ονομασία "
 "«Ρύθμιση της εκκίνησης του συστήματος»."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -940,15 +1030,16 @@ msgstr ""
 "υπολογιστή!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Στην πρώτη ενότητα που ονομάζεται <guilabel>Πρόγραμμα εκκίνησης</guilabel>, "
 "μπορείτε να επιλέξετε το <guibutton>Πρόγραμμα εκκίνησης που θα "
@@ -961,12 +1052,21 @@ msgstr ""
 "υπολογιστή."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Στο δεύτερο τμήμα με τίτλο <guilabel>Κύριες επιλογές</guilabel>, μπορείτε να "
@@ -977,7 +1077,7 @@ msgstr ""
 "θα εκκινήσει το προεπιλεγμένο μετά το πέρας της χρονικής καθυστέρησης."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -986,19 +1086,19 @@ msgstr ""
 "να καθορίσετε έναν κωδικό πρόσβασης."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Το κουμπί <guibutton>Για προχωρημένους</guibutton> παρέχει κάποιες επιπλέον "
 "επιλογές."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Ενεργοποίηση ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1011,12 +1111,12 @@ msgstr ""
 "APM. Επιλέξτε αυτό το πλαίσιο αν το υλικό σας είναι συμβατό με το ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Ενεργοποίηση SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1025,7 +1125,7 @@ msgstr ""
 "αρχιτεκτονική επεξεργαστών πολλαπλών πυρήνων."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1034,7 +1134,7 @@ msgstr ""
 "επεξεργαστή και θα ενεργοποιήσει το SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1043,7 +1143,7 @@ msgstr ""
 "APIC:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1063,20 +1163,34 @@ msgstr ""
 "το APIC και/ή το Τοπικό APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Αναγνωριστικό σύνδεσης</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
+msgid ""
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Στην <guibutton>επόμενη</guibutton> οθόνη, μπορείτε να δείτε τη λίστα όλες "
 "τις διαθέσιμες καταχωρήσεις εκκίνησης. Η εξ ορισμού εμφανίζεται με ένα "
@@ -1087,13 +1201,13 @@ msgstr ""
 "καταχώρηση του Grub ή να επεξεργαστείτε μια υπάρχουσα. Θα πρέπει να είστε "
 "εξοικειωμένοι με το Grub ή το Lilo για να χρησιμοποιήσετε αυτά τα εργαλεία."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1103,8 +1217,8 @@ msgstr ""
 "γράψετε οτιδήποτε επιθυμείτε να εμφανίζεται στο μενού. Αντιστοιχεί στην "
 "εντολή του Grub «title». Για παράδειγμα: Mageia 3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1112,8 +1226,8 @@ msgstr ""
 "Το πεδίο <guilabel>Εικόνα</guilabel> περιέχει το όνομα του πυρήνα. "
 "Αντιστοιχεί στην εντολή του Grub «kernel». Για παράδειγμα /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1122,8 +1236,9 @@ msgstr ""
 "που βρίσκεται ο πυρήνας. Αντιστοιχεί στην εντολή του Grub «root». Για "
 "παράδειγμα (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1131,8 +1246,8 @@ msgstr ""
 "Το πεδίο <guilabel>Επιλογές περασμένες στον πυρήνα</guilabel> περιέχει τις "
 "επιλογές του πυρήνα κατά την εκκίνηση."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1140,8 +1255,8 @@ msgstr ""
 "Αν είναι επιλεγμένο το πλαίσιο <guilabel>Προκαθορισμένο</guilabel>, το Grub "
 "θα φορτώνει τη συγκεκριμένη καταχώρηση εξ ορισμού."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1153,90 +1268,64 @@ msgstr ""
 "<guilabel>initrd</guilabel> και ένα <guilabel>προφίλ δικτύου</guilabel>, "
 "δείτε στο <xref linkend=\"draknetprofile\"></xref> στην κυλιόμενη λίστα."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Ρυθμίστε την αυτόματη σύνδεση χρήστη"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Αναγνωριστικό σύνδεσης</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
-"πληκτρολογώντας <emphasis role= \"bold\">drakboot</emphasis> ως διαχειριστής "
-"συστήματος."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Αυτό το εργαλείο <placeholder type=\"footnote\" id=\"0\"/> σας επιτρέπει την "
-"αυτόματη σύνδεση ενός χρήστη, χωρίς να ερωτηθεί για τον κωδικό πρόσβασης. "
-"Συνήθως εξυπηρετεί όταν υπάρχει μόνο ένας χρήστης στο μηχάνημα."
+"Στην επιπλέον οθόνη <guilabel>Για προχωρημένους</guilabel>, μπορείτε να "
+"επιλέξετε τη <guilabel>λειτουργία βίντεο</guilabel>, ένα αρχείο "
+"<guilabel>initrd</guilabel> και ένα <guilabel>προφίλ δικτύου</guilabel>, "
+"δείτε στο <xref linkend=\"draknetprofile\"></xref> στην κυλιόμενη λίστα."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Θα το βρείτε στην καρτέλα <emphasis role=\"bold\">Εκκίνηση</emphasis> στο "
-"Κέντρο Ελέγχου Mageia με την ονομασία «Ρύθμιση της αυτόματης εκκίνησης "
-"χρήστη»."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Τα κουμπιά ελέγχου είναι ευνόητα:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Επιλέξτε την <guibutton>«Εκτέλεση του γραφικού περιβάλλοντος κατά την "
-"εκκίνηση του συστήματος»</guibutton>, αν επιθυμείτε την εκκίνηση του "
-"συστήματος γραφικού περιβάλλοντος X Window System κατά την εκκίνηση. "
-"Διαφορετικά, το σύστημα θα εκκινηθεί σε λειτουργία κειμένου (χωρίς γραφικό "
-"περιβάλλον). Αυτό μπορεί να πραγματοποιηθεί χειροκίνητα εκτελώντας την "
-"εντολή «startx» ή «systemctl start dm»."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Αν η πρώτη επιλογή είναι επιλεγμένη, προσφέρονται άλλες δυο επιλογές· "
-"<guibutton>Όχι δεν επιθυμώ την αυτόματη σύνδεση</guibutton>, αν επιθυμείτε "
-"τη σύνδεση σε κάθε εκκίνηση με το όνομα χρήστη και τον κωδικό πρόσβασης ή "
-"επιλέξτε <guibutton>Ναι, επιθυμώ την αυτόματη σύνδεση</guibutton>. Σε αυτήν "
-"την περίπτωση, θα πρέπει να παράσχετε το προεπιλεγμένο <guilabel>Όνομα "
-"χρήστη</guilabel> και το εξ ορισμού <guilabel>Γραφικό περιβάλλον</guilabel>."
+"Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
+"πληκτρολογώντας <emphasis role= \"bold\">drakboot</emphasis> ως διαχειριστής "
+"συστήματος."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2687,22 +2776,22 @@ msgstr ""
 "περισσότερη επεξήγηση επ' αυτού."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Διαχειριστείτε τις κατατμήσεις των σκληρών δίσκων"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk ή diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2713,7 +2802,7 @@ msgstr ""
 "\"bold\">diskdrake</emphasis> ως διαχειριστής συστήματος."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2729,7 +2818,7 @@ msgstr ""
 "δεν είστε σίγουρος ότι επιθυμείτε να συνεχίσετε."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2739,12 +2828,12 @@ msgstr ""
 "(sda, sdb, sdc, κλπ)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2762,9 +2851,17 @@ msgstr ""
 "άλλα κουμπιά γίνονται ορατά στο δεξιό τμήμα αφού κάνετε κλικ σε μια "
 "κατάτμηση. "
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2775,12 +2872,12 @@ msgstr ""
 "κατάτμηση πρώτα."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Μπορείτε να αλλάξετε το μέγεθος μιας κατάτμησης μόνο προς τα δεξιά"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2793,22 +2890,23 @@ msgstr ""
 "guibutton> εμφανίζεται όταν έχει επιλεγεί ένα κενό τμήμα του δίσκου."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Μπορείτε να επιλέξετε ένα μη υπάρχον σημείο προσάρτησης καθώς αυτό θα "
 "δημιουργηθεί."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Επιλέγοντας σε <emphasis><guibutton>Εναλλαγή σε προχωρημένη λειτουργία</"
@@ -2817,7 +2915,7 @@ msgstr ""
 "στιγμιότυπο."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6272,8 +6370,8 @@ msgid ""
 "by default and you have to also install the drakwizard and drakwizard-base "
 "packages."
 msgstr ""
-"Ο σκοπός του εργαλείου αυτού<placeholder type=\"footnote\" id=\"0\"/> είναι η "
-"ρύθμιση της ώρας του διακομιστή σας συγχρονίζοντάς την με έναν εξωτερικό "
+"Ο σκοπός του εργαλείου αυτού<placeholder type=\"footnote\" id=\"0\"/> είναι "
+"η ρύθμιση της ώρας του διακομιστή σας συγχρονίζοντάς την με έναν εξωτερικό "
 "διακομιστή. Δεν είναι εγκατεστημένο εξ ορισμού και θα πρέπει επίσης να "
 "εγκαταστήσετε τα πακέτα drakwizard και drakwizard-base."
 
@@ -6290,8 +6388,8 @@ msgid ""
 "because this server always points to available time servers."
 msgstr ""
 "Μετά την οθόνη υποδοχής (δείτε ανωτέρω), η δεύτερη σας ρωτά να επιλέξετε "
-"τρεις εξυπηρετητές ώρας από την αναπτυσσόμενη λίστα και σας συστήνει τη χρήση "
-"του pool.ntp.org δυο φορές διότι αυτός ο εξυπηρετητής υποδεικνύει σε "
+"τρεις εξυπηρετητές ώρας από την αναπτυσσόμενη λίστα και σας συστήνει τη "
+"χρήση του pool.ntp.org δυο φορές διότι αυτός ο εξυπηρετητής υποδεικνύει σε "
 "διαθέσιμους εξυπηρετητές ώρας."
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
@@ -6323,12 +6421,12 @@ msgid ""
 "click on the <guibutton>Next</guibutton> button to proceed to the test. It "
 "may take a while and you finally get this screen below:"
 msgstr ""
-"Οι οθόνες που ακολουθούν σας επιτρέπουν να επιλέξετε την περιοχή και την πόλη "
-"και στη συνέχεια καταλήγει στη σύνοψη. Αν κάτι είναι λανθασμένο, μπορείτε "
-"φυσικά να το αλλάξετε χρησιμοποιώντας το κουμπί <guibutton>Προηγούμενο<"
-"/guibutton>. Αν όλα είναι σωστά, κάντε κλικ στο κουμπί <guibutton>Επόμενο<"
-"/guibutton> για να προχωρήσετε στη δοκιμή. Ίσως να διαρκέσει ένα χρονικό "
-"διάστημα μέχρι να καταλήξετε στην παρακάτω οθόνη:"
+"Οι οθόνες που ακολουθούν σας επιτρέπουν να επιλέξετε την περιοχή και την "
+"πόλη και στη συνέχεια καταλήγει στη σύνοψη. Αν κάτι είναι λανθασμένο, "
+"μπορείτε φυσικά να το αλλάξετε χρησιμοποιώντας το κουμπί "
+"<guibutton>Προηγούμενο</guibutton>. Αν όλα είναι σωστά, κάντε κλικ στο "
+"κουμπί <guibutton>Επόμενο</guibutton> για να προχωρήσετε στη δοκιμή. Ίσως να "
+"διαρκέσει ένα χρονικό διάστημα μέχρι να καταλήξετε στην παρακάτω οθόνη:"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_ntp.xml:72
@@ -6359,10 +6457,9 @@ msgid ""
 "clock.orig</code> and <code>/etc/ntp/step-tickers</code> to <code>/etc/ntp/"
 "step-tickers.orig</code>;"
 msgstr ""
-"Αποθηκεύει τα αρχεία <code>/etc/sysconfig/clock</code> στο <code>"
-"/etc/sysconfig/"
-"clock.orig</code> και <code>/etc/ntp/step-tickers</code> στο <code>"
-"/etc/ntp/step-tickers.orig</code>·"
+"Αποθηκεύει τα αρχεία <code>/etc/sysconfig/clock</code> στο <code>/etc/"
+"sysconfig/clock.orig</code> και <code>/etc/ntp/step-tickers</code> στο "
+"<code>/etc/ntp/step-tickers.orig</code>·"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakwizard_ntp.xml:104
@@ -6388,8 +6485,8 @@ msgid ""
 "Stopping and starting <code>crond</code>, <code>atd</code> and <code>ntpd</"
 "code> services;"
 msgstr ""
-"Διακοπή και έναρξη των υπηρεσιών <code>crond</code>, <code>atd</code> και <"
-"code>ntpd</code>·"
+"Διακοπή και έναρξη των υπηρεσιών <code>crond</code>, <code>atd</code> και "
+"<code>ntpd</code>·"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakwizard_ntp.xml:119
@@ -6445,10 +6542,10 @@ msgid ""
 "protocol used to transfer files from one host to another host over a "
 "<acronym>TCP</acronym>-based network, such as the Internet. (From Wikipedia)"
 msgstr ""
-"Το Πρωτόκολλο Μεταφοράς Αρχείων (File Transfer Protocol <acronym>FTP</acronym>"
-") είναι ένα πρότυπο δικτυακού πρωτοκόλλου που χρησιμοποιείται για τη μεταφορά "
-"αρχείων από τον έναν υπολογιστή στον άλλον μέσω ενός δικτύου <acronym>TCP<"
-"/acronym>, όπως το διαδίκτυο. (Από τη Βικιπαίδεια)"
+"Το Πρωτόκολλο Μεταφοράς Αρχείων (File Transfer Protocol <acronym>FTP</"
+"acronym>) είναι ένα πρότυπο δικτυακού πρωτοκόλλου που χρησιμοποιείται για τη "
+"μεταφορά αρχείων από τον έναν υπολογιστή στον άλλον μέσω ενός δικτύου "
+"<acronym>TCP</acronym>, όπως το διαδίκτυο. (Από τη Βικιπαίδεια)"
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_proftpd.xml:21
@@ -6476,8 +6573,8 @@ msgid ""
 "Exposing the FTP server to the Internet has it's risks. Be ready for bad "
 "things."
 msgstr ""
-"Η έκθεση του εξυπηρετητή FTP στο διαδίκτυο μπορεί να υπολανθάνει "
-"κινδύνους. Να είστε έτοιμοι για παν ενδεχόμενο."
+"Η έκθεση του εξυπηρετητή FTP στο διαδίκτυο μπορεί να υπολανθάνει κινδύνους. "
+"Να είστε έτοιμοι για παν ενδεχόμενο."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_proftpd.xml:49
@@ -6515,8 +6612,7 @@ msgid ""
 "(File eXchange Protocol)"
 msgstr ""
 "Διαμόρφωση της θύρας ακρόασης, τον κατάλογο chroot, επιτρέψτε τη συνέχιση "
-"μεταφοράς και το <acronym>FXP</acronym> "
-"(File eXchange Protocol)"
+"μεταφοράς και το <acronym>FXP</acronym> (File eXchange Protocol)"
 
 #. type: Attribute 'fileref' of: <section><section><procedure><step><mediaobject><imageobject><imagedata>
 #: en/drakwizard_proftpd.xml:74
@@ -6561,8 +6657,8 @@ msgid ""
 "before you can access to it."
 msgstr ""
 "Αυτό το εργαλείο<placeholder type=\"footnote\" id=\"0\"/> μπορεί να σας "
-"βοηθήσει να ρυθμίσετε έναν εξυπηρετητή διαμεσολαβητή. Είναι ένα "
-"συστατικό του drakwizard το οποίο θα πρέπει να έχει εγκατασταθεί από πριν."
+"βοηθήσει να ρυθμίσετε έναν εξυπηρετητή διαμεσολαβητή. Είναι ένα συστατικό "
+"του drakwizard το οποίο θα πρέπει να έχει εγκατασταθεί από πριν."
 
 #. type: Content of: <section><section><title>
 #: en/drakwizard_squid.xml:29
@@ -6674,8 +6770,8 @@ msgstr "drakwizard-proxy-step5.png"
 #: en/drakwizard_squid.xml:111
 msgid "Grant access to local networks, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Χορηγήστε την πρόσβαση στα τοπικά δίκτυα και κάντε κλικ στο <guibutton>"
-"Επόμενο</guibutton>."
+"Χορηγήστε την πρόσβαση στα τοπικά δίκτυα και κάντε κλικ στο "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_squid.xml:116
@@ -6753,8 +6849,8 @@ msgid ""
 "Saving <code>/etc/squid/squid.conf</code> in <code>/etc/squid/squid.conf."
 "orig;</code>"
 msgstr ""
-"Αποθήκευση του <code>/etc/squid/squid.conf</code> στο <code>"
-"/etc/squid/squid.conf.orig</code>·"
+"Αποθήκευση του <code>/etc/squid/squid.conf</code> στο <code>/etc/squid/squid."
+"conf.orig</code>·"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><para>
 #: en/drakwizard_squid.xml:202
@@ -6762,8 +6858,8 @@ msgid ""
 "Creating a new <code>squid.conf</code> starting from <code>squid.conf."
 "default</code> and adding the new parameters:"
 msgstr ""
-"Δημιουργία ενός νέου <code>squid.conf</code> ξεκινώντας από το <code>"
-"squid.conf.default</code> και πρόσθεση των νέων παραμέτρων:"
+"Δημιουργία ενός νέου <code>squid.conf</code> ξεκινώντας από το <code>squid."
+"conf.default</code> και πρόσθεση των νέων παραμέτρων:"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakwizard_squid.xml:208
@@ -6790,7 +6886,8 @@ msgstr "http_port"
 msgid ""
 "<code>level</code> 1, 2 or 3 and <code>http_access</code> according to level"
 msgstr ""
-"<code>level</code> 1, 2 ή 3 και <code>http_access</code> ανάλογα με το επίπεδο"
+"<code>level</code> 1, 2 ή 3 και <code>http_access</code> ανάλογα με το "
+"επίπεδο"
 
 #. type: Content of: <section><section><para><itemizedlist><listitem><itemizedlist><listitem><para>
 #: en/drakwizard_squid.xml:229
@@ -6888,9 +6985,9 @@ msgid ""
 "Choose <guilabel>Expert</guilabel> for all options or <guilabel>Newbie</"
 "guilabel> to skip steps 3-7, click <guibutton>Next</guibutton>."
 msgstr ""
-"Επιλέξτε <guilabel>Ειδήμονας</guilabel> για όλες τις επιλογές ή <guilabel>"
-"Αρχάριος</guilabel> για την παράλειψη των βημάτων 3-7· κάντε κλικ στο <"
-"guibutton>Επόμενο</guibutton>."
+"Επιλέξτε <guilabel>Ειδήμονας</guilabel> για όλες τις επιλογές ή "
+"<guilabel>Αρχάριος</guilabel> για την παράλειψη των βημάτων 3-7· κάντε κλικ "
+"στο <guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:39
@@ -6927,9 +7024,9 @@ msgid ""
 "Allow a variety of authentication methods users can use while connecting, "
 "then click <guibutton>Next</guibutton>."
 msgstr ""
-"Επιτρέπει μια ποικιλία μεθόδων ταυτοποίησης που μπορούν να χρησιμοποιήσουν οι "
-"χρήστες κατά την σύνδεση· στη συνέχεια κάντε κλικ στο κουμπί <guibutton>"
-"Επόμενο</guibutton>."
+"Επιτρέπει μια ποικιλία μεθόδων ταυτοποίησης που μπορούν να χρησιμοποιήσουν "
+"οι χρήστες κατά την σύνδεση· στη συνέχεια κάντε κλικ στο κουμπί "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:61
@@ -6947,8 +7044,8 @@ msgid ""
 "Choose logging facility and level of output, then click <guibutton>Next</"
 "guibutton>."
 msgstr ""
-"Επιλέξτε τις καταγραφές facility και το επίπεδο εξόδου και κάντε κλικ στο <"
-"guibutton>Επόμενο</guibutton>."
+"Επιλέξτε τις καταγραφές facility και το επίπεδο εξόδου και κάντε κλικ στο "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:72
@@ -6964,8 +7061,8 @@ msgstr "drakwizard-sshd-step5.png"
 #: en/drakwizard_sshd.xml:79
 msgid "Configure per-login settings, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Διαμόρφωση των ρυθμίσεων ανά σύνδεση και κλικ στο <guibutton>Επόμενο<"
-"/guibutton>."
+"Διαμόρφωση των ρυθμίσεων ανά σύνδεση και κλικ στο <guibutton>Επόμενο</"
+"guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:83
@@ -6982,8 +7079,8 @@ msgstr "drakwizard-sshd-step6.png"
 msgid ""
 "Configure the user access settings, then click <guibutton>Next</guibutton>."
 msgstr ""
-"Διαμόρφωση των ρυθμίσεων πρόσβασης του χρήστη, και κάντε κλικ στο <guibutton>"
-"Επόμενο</guibutton>."
+"Διαμόρφωση των ρυθμίσεων πρόσβασης του χρήστη, και κάντε κλικ στο "
+"<guibutton>Επόμενο</guibutton>."
 
 #. type: Content of: <section><section><procedure><step><title>
 #: en/drakwizard_sshd.xml:94
@@ -7018,8 +7115,8 @@ msgstr "drakwizard-sshd-step9.png"
 #: en/drakxservices.xml:3
 msgid "Manage system services by enabling or disabling them"
 msgstr ""
-"Διαχειριστείτε τις υπηρεσίες συστήματος ενεργοποιώντας τες ή απενεργοποιώντας "
-"τες."
+"Διαχειριστείτε τις υπηρεσίες συστήματος ενεργοποιώντας τες ή "
+"απενεργοποιώντας τες."
 
 #. type: Content of: <section><info><subtitle>
 #: en/drakxservices.xml:3
@@ -7039,8 +7136,7 @@ msgid ""
 msgstr ""
 "Μπορείτε να εκκινήσετε αυτό το εργαλείο από τη γραμμή εντολών, "
 "πληκτρολογώντας <emphasis role= \"bold\">drakxservices</emphasis> ως "
-"διαχειριστής "
-"συστήματος."
+"διαχειριστής συστήματος."
 
 #. type: Content of: <section><info><title>
 #: en/harddrake2.xml:10
@@ -7112,8 +7208,8 @@ msgid ""
 "about the content of the fields."
 msgstr ""
 "Η δεξιά στήλη εμφανίζει πληροφορίες σχετικά με την επιλεγμένη συσκευή. Το "
-"μενού <guimenu>Βοήθεια -&gt; Περιγραφή των πεδίων</guimenu> δίνει πληροφορίες "
-"σχετικά με το περιεχόμενο των πεδίων."
+"μενού <guimenu>Βοήθεια -&gt; Περιγραφή των πεδίων</guimenu> δίνει "
+"πληροφορίες σχετικά με το περιεχόμενο των πεδίων."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:43
@@ -7131,9 +7227,10 @@ msgid ""
 "parameterize the module which is used in relation to the device. This must "
 "used by experts only."
 msgstr ""
-"<guibutton>Ορισμός επιλογών του τρέχοντος οδηγού</guibutton>: χρησιμοποιείται "
-"για την παραμετροποίηση του αρθρώματος που χρησιμοποιείται σχετισμένο με τη "
-"συσκευή. Αυτό θα πρέπει να χρησιμοποιείται μόνο από ειδήμονες."
+"<guibutton>Ορισμός επιλογών του τρέχοντος οδηγού</guibutton>: "
+"χρησιμοποιείται για την παραμετροποίηση του αρθρώματος που χρησιμοποιείται "
+"σχετισμένο με τη συσκευή. Αυτό θα πρέπει να χρησιμοποιείται μόνο από "
+"ειδήμονες."
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/harddrake2.xml:54
@@ -7142,8 +7239,8 @@ msgid ""
 "configure the device. The tool can often be accessed directly from the MCC."
 msgstr ""
 "<guibutton>Εκτέλεση του εργαλείου διαμόρφωσης</guibutton>: πρόσβαση στο "
-"εργαλείο διαμόρφωσης της συσκευής. Συχνά μπορεί να προσπελαστεί απευθείας από "
-"το Κέντρο Έλεγχου Mageia."
+"εργαλείο διαμόρφωσης της συσκευής. Συχνά μπορεί να προσπελαστεί απευθείας "
+"από το Κέντρο Έλεγχου Mageia."
 
 #. type: Content of: <section><section><para>
 #: en/harddrake2.xml:68
@@ -7216,9 +7313,9 @@ msgid ""
 msgstr ""
 "Το keyboarddrake<placeholder type=\"footnote\" id=\"0\"/> βοηθά στην "
 "διαμόρφωση της βασικής διάταξης του πληκτρολογίου. Επηρεάζει την διάταξη του "
-"πληκτρολογίου για όλους τους χρήστες. Είναι διαθέσιμο από την ενότητα «Υλικό» "
-"στο κέντρο ελέγχου Mageia (ΚΕM) με την ονομασία «Διαμόρφωση του ποντικιού και "
-"του πληκτρολογίου». "
+"πληκτρολογίου για όλους τους χρήστες. Είναι διαθέσιμο από την ενότητα "
+"«Υλικό» στο κέντρο ελέγχου Mageia (ΚΕM) με την ονομασία «Διαμόρφωση του "
+"ποντικιού και του πληκτρολογίου». "
 
 #. type: Content of: <section><section><title>
 #: en/keyboarddrake.xml:29
@@ -7413,19 +7510,19 @@ msgid ""
 "possible to save the results in the .txt format by clicking on the <emphasis "
 "role=\"bold\">Save</emphasis> button."
 msgstr ""
-"Πρώτα εισαγάγετε την συμβολοσειρά που επιθυμείτε να αναζητήσετε στο πεδίο <"
-"emphasis role=\"bold\">Ταιριάζει</emphasis> και/ή αυτήν που <emphasis>δεν "
+"Πρώτα εισαγάγετε την συμβολοσειρά που επιθυμείτε να αναζητήσετε στο πεδίο "
+"<emphasis role=\"bold\">Ταιριάζει</emphasis> και/ή αυτήν που <emphasis>δεν "
 "θέλετε</emphasis> να εμφανιστεί στο πεδίο <emphasis role=\"bold\">αλλά δεν "
 "ταιριάζει</emphasis>. Στη συνέχεια επιλέξτε τα αρχεία που θα γίνει η "
 "αναζήτηση από το πλαίσιο <guilabel>Επιλέξτε αρχείο</guilabel>. Προαιρετικά "
-"μπορείτε να περιορίσετε την αναζήτηση σε μια μόνον ημέρα. Επιλέξτε την από το "
-"<emphasis role=\"bold\">ημερολόγιο</emphasis>, μέσω των μικρών βελών σε κάθε "
-"πλευρά του μηνός και του έτους, και επιλέξτε «<guibutton>Εμφάνιση μόνον για "
-"την επιλεγμένη ημέρα</guibutton>». Εν τέλει, κάντε κλικ στο κουμπί <guibutton>"
-"αναζήτηση</guibutton> ούτως ώστε να προβληθούν τα αποτελέσματα στο παράθυρο "
-"με τίτλο <guilabel>Περιεχόμενο του αρχείου</guilabel>. Υπάρχει η δυνατότητα "
-"αποθήκευσης των αποτελεσμάτων υπό μορφή .txt κάνοντας κλικ στο κουμπί <"
-"emphasis role=\"bold\">Αποθήκευση</emphasis>."
+"μπορείτε να περιορίσετε την αναζήτηση σε μια μόνον ημέρα. Επιλέξτε την από "
+"το <emphasis role=\"bold\">ημερολόγιο</emphasis>, μέσω των μικρών βελών σε "
+"κάθε πλευρά του μηνός και του έτους, και επιλέξτε «<guibutton>Εμφάνιση μόνον "
+"για την επιλεγμένη ημέρα</guibutton>». Εν τέλει, κάντε κλικ στο κουμπί "
+"<guibutton>αναζήτηση</guibutton> ούτως ώστε να προβληθούν τα αποτελέσματα "
+"στο παράθυρο με τίτλο <guilabel>Περιεχόμενο του αρχείου</guilabel>. Υπάρχει "
+"η δυνατότητα αποθήκευσης των αποτελεσμάτων υπό μορφή .txt κάνοντας κλικ στο "
+"κουμπί <emphasis role=\"bold\">Αποθήκευση</emphasis>."
 
 #. type: Content of: <section><section><note><para>
 #: en/logdrake.xml:36
@@ -7464,12 +7561,11 @@ msgid ""
 "services are displayed and you can choose which ones you want to look watch. "
 "(See screenshot above)."
 msgstr ""
-"Για την διαμόρφωση του εργαλείου, κάντε κλικ στο κουμπί <emphasis "
-"role=\"bold\">Συναγερμός μέσω αλληλογραφίας</emphasis> και στην επόμενη "
-"οθόνη, στο <guibutton>Διαμόρφωση του συστήματος συναγερμού μέσω "
-"αλληλογραφίας</guibutton>. Εδώ εμφανίζονται όλες οι τρέχουσες υπηρεσίες και "
-"μπορείτε να επιλέξετε αυτές που θα εποπτεύονται (Δείτε στο παρακάτω "
-"στιγμιότυπο)."
+"Για την διαμόρφωση του εργαλείου, κάντε κλικ στο κουμπί <emphasis role=\"bold"
+"\">Συναγερμός μέσω αλληλογραφίας</emphasis> και στην επόμενη οθόνη, στο "
+"<guibutton>Διαμόρφωση του συστήματος συναγερμού μέσω αλληλογραφίας</"
+"guibutton>. Εδώ εμφανίζονται όλες οι τρέχουσες υπηρεσίες και μπορείτε να "
+"επιλέξετε αυτές που θα εποπτεύονται (Δείτε στο παρακάτω στιγμιότυπο)."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:55
@@ -7532,9 +7628,9 @@ msgid ""
 msgstr ""
 "Στην επόμενη οθόνη, επιλέξτε τον <guilabel>Φόρτο</guilabel> που θεωρείτε "
 "απαράδεκτο. Ο φόρτος αναπαριστά την ζήτηση μιας διεργασίας, ένας υψηλός "
-"φόρτος επιβραδύνει το σύστημα και ένας υψηλός φόρτος μπορεί να υποδηλώνει ότι "
-"η διεργασία έχει τεθεί εκτός ελέγχου. Η τιμή εξ ορισμού είναι 3. Συνιστάται "
-"να θέσετε την τιμή του φόρτου 3 φορές τον αριθμό των επεξεργαστών."
+"φόρτος επιβραδύνει το σύστημα και ένας υψηλός φόρτος μπορεί να υποδηλώνει "
+"ότι η διεργασία έχει τεθεί εκτός ελέγχου. Η τιμή εξ ορισμού είναι 3. "
+"Συνιστάται να θέσετε την τιμή του φόρτου 3 φορές τον αριθμό των επεξεργαστών."
 
 #. type: Content of: <section><section><para>
 #: en/logdrake.xml:103
@@ -7544,9 +7640,9 @@ msgid ""
 "or on the Internet)."
 msgstr ""
 "Στην τελευταία οθόνη, εισαγάγετε την <guilabel>διεύθυνση του ηλεκτρονικού "
-"ταχυδρομείου</guilabel> του ατόμου που θα πρέπει να ειδοποιηθεί και τον <"
-"guilabel>διακομιστή ταχυδρομείου</guilabel> που θα χρησιμοποιηθεί (τοπικός ή "
-"στο διαδίκτυο)."
+"ταχυδρομείου</guilabel> του ατόμου που θα πρέπει να ειδοποιηθεί και τον "
+"<guilabel>διακομιστή ταχυδρομείου</guilabel> που θα χρησιμοποιηθεί (τοπικός "
+"ή στο διαδίκτυο)."
 
 #. type: Content of: <section><info><title>
 #: en/lsnetdrake.xml:10
@@ -7585,8 +7681,8 @@ msgid ""
 "advance."
 msgstr ""
 "Αυτή η σελίδα δεν έχει συγγραφεί ακόμα λόγω ελλειπουσών πηγών. Αν πιστεύετε "
-"ότι μπορείτε να συγγράψετε ένα εγχειρίδιο, παρακαλώ επικοινωνήστε με την <"
-"link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">ομάδα "
+"ότι μπορείτε να συγγράψετε ένα εγχειρίδιο, παρακαλώ επικοινωνήστε με την "
+"<link ns2:href=\"https://wiki.mageia.org/en/Documentation_team\">ομάδα "
 "τεκμηρίωσης</link>. Ευχαριστούμε εκ των προτέρων."
 
 #. type: Content of: <section><info><title>
@@ -7627,8 +7723,8 @@ msgid ""
 "packages to work."
 msgstr ""
 "Η lspcidrake παρέχει τον κατάλογο όλων των συνδεδεμένων συσκευών στον "
-"υπολογιστή (USB, PCI και PCMCIA) και τους χρησιμοποιούμενους οδηγούς. Για την "
-"λειτουργία του απαιτούνται τα πακέτα ldetect και ldetect-lst."
+"υπολογιστή (USB, PCI και PCMCIA) και τους χρησιμοποιούμενους οδηγούς. Για "
+"την λειτουργία του απαιτούνται τα πακέτα ldetect και ldetect-lst."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
 #: en/lspcidrake.xml:20
@@ -7640,8 +7736,8 @@ msgstr "lspcidrake1.png"
 msgid ""
 "With the -v option, lspcidrake adds the vendor and device identifications."
 msgstr ""
-"Με το όρισμα -v, η lspcidrake προσθέτει τα αναγνωριστικά του κατασκευαστή και "
-"της συσκευής."
+"Με το όρισμα -v, η lspcidrake προσθέτει τα αναγνωριστικά του κατασκευαστή "
+"και της συσκευής."
 
 #. type: Content of: <section><para>
 #: en/lspcidrake.xml:27
@@ -7735,8 +7831,8 @@ msgid ""
 "Control Center under the tab <emphasis role=\"bold\">Software management.</"
 "emphasis>"
 msgstr ""
-"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/>"
-"Κέντρο Ελέγχου Mageia και στην καρτέλα <emphasis role=\"bold\">Διαχείριση "
+"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/"
+">Κέντρο Ελέγχου Mageia και στην καρτέλα <emphasis role=\"bold\">Διαχείριση "
 "λογισμικού</emphasis>"
 
 #. type: Content of: <section><para><note><para>
@@ -7746,9 +7842,9 @@ msgid ""
 "edit-media with some media checked as updates. If they are not, you are "
 "prompted to do so."
 msgstr ""
-"Για την λειτουργία του απαιτείται να έχουν διαμορφωθεί τα αποθετήρια μέσω του "
-"rpmdrake-edit-media με μερικά μέσα ενημέρωσης διαμορφωμένα. Αν δεν συμβαίνει "
-"αυτό, θα ερωτηθείτε να το κάνετε."
+"Για την λειτουργία του απαιτείται να έχουν διαμορφωθεί τα αποθετήρια μέσω "
+"του rpmdrake-edit-media με μερικά μέσα ενημέρωσης διαμορφωμένα. Αν δεν "
+"συμβαίνει αυτό, θα ερωτηθείτε να το κάνετε."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:23
@@ -7760,8 +7856,8 @@ msgid ""
 msgstr ""
 "Μετά από την εκτέλεση του εργαλείου, γίνεται σάρωση των ήδη εγκατεστημένων "
 "πακέτων και εμφανίζει αυτά με διαθέσιμη ενημέρωση στα αποθετήρια. Είναι εξ "
-"ορισμού επιλεγμένα για λήψη και εγκατάσταση. Κάντε κλικ στο κουμπί <guibutton>"
-"Ενημέρωση</guibutton> για την έναρξη της διαδικασίας."
+"ορισμού επιλεγμένα για λήψη και εγκατάσταση. Κάντε κλικ στο κουμπί "
+"<guibutton>Ενημέρωση</guibutton> για την έναρξη της διαδικασίας."
 
 #. type: Content of: <section><para>
 #: en/MageiaUpdate.xml:28
@@ -7818,13 +7914,14 @@ msgstr "Ρυθμίστε τα στάδια εκκίνησης"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -7996,18 +8093,18 @@ msgid ""
 "installed. Each of these tabs gives a different set of tools that can be "
 "selected in the big right panel."
 msgstr ""
-"Το Κέντρο Ελέγχου Mageia (ΚΕM) διαθέτει οκτώ διαφορετικές επιλογές ή καρτέλες "
-"για να επιλέξετε στην αριστερή στήλη, ή δέκα αν έχετε εγκαταστήσει το πακέτο "
-"drakwizard. Η έκαστη καρτέλα προσφέρει ένα διαφορετικό σύνολο εργαλείων προς "
-"επιλογή από τον ευρύ πίνακα στα δεξιά."
+"Το Κέντρο Ελέγχου Mageia (ΚΕM) διαθέτει οκτώ διαφορετικές επιλογές ή "
+"καρτέλες για να επιλέξετε στην αριστερή στήλη, ή δέκα αν έχετε εγκαταστήσει "
+"το πακέτο drakwizard. Η έκαστη καρτέλα προσφέρει ένα διαφορετικό σύνολο "
+"εργαλείων προς επιλογή από τον ευρύ πίνακα στα δεξιά."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:8
 msgid ""
 "The ten following chapters are about those ten options and the related tools."
 msgstr ""
-"Τα παρακάτω δέκα κεφάλαια αναφέρονται στις δέκα αυτές επιλογές και τα σχετικά "
-"εργαλεία."
+"Τα παρακάτω δέκα κεφάλαια αναφέρονται στις δέκα αυτές επιλογές και τα "
+"σχετικά εργαλεία."
 
 #. type: Content of: <section><para>
 #: en/mcc-intro.xml:10
@@ -8052,9 +8149,9 @@ msgid ""
 "In this screen you can choose between several tools to manage or share your "
 "local disks. Click on a link below to learn more."
 msgstr ""
-"Σε αυτή την οθόνη μπορείτε να διαλέξετε μεταξύ διάφορων εργαλείων διαχείρισης "
-"ή κοινής χρήσης των τοπικών σας δίσκων. Πατήστε σε έναν σύνδεσμο παρακάτω για "
-"να μάθετε περισσότερα."
+"Σε αυτή την οθόνη μπορείτε να διαλέξετε μεταξύ διάφορων εργαλείων "
+"διαχείρισης ή κοινής χρήσης των τοπικών σας δίσκων. Πατήστε σε έναν σύνδεσμο "
+"παρακάτω για να μάθετε περισσότερα."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-localdisks.xml:18
@@ -8092,8 +8189,8 @@ msgstr ""
 "Αυτή η οθόνη μαζί με αυτήν της <emphasis>Κοινής χρήσης</emphasis> είναι "
 "ορατές μόνο αν έχετε εγκαταστήσει το πακέτο <emphasis>drakwizard</emphasis>. "
 "Μπορείτε να επιλέξετε μεταξύ διαφόρων εργαλείων για την διαμόρφωση των "
-"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref "
-"linkend=\"mcc-sharing\"/>για να μάθετε περισσότερα."
+"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref linkend=\"mcc-"
+"sharing\"/>για να μάθετε περισσότερα."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-networkservices.xml:19
@@ -8322,8 +8419,8 @@ msgstr ""
 "Αυτή η οθόνη μαζί με αυτήν των <emphasis>Υπηρεσιών δικτύου</emphasis> είναι "
 "ορατές μόνο αν έχετε εγκαταστήσει το πακέτο <emphasis>drakwizard</emphasis>. "
 "Μπορείτε να επιλέξετε μεταξύ διαφόρων εργαλείων για την διαμόρφωση των "
-"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref "
-"linkend=\"mcc-networkservices\"/>για να μάθετε περισσότερα."
+"διακομιστών. Κάντε κλικ σε έναν σύνδεσμο παρακάτω ή στο <xref linkend=\"mcc-"
+"networkservices\"/>για να μάθετε περισσότερα."
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-sharing.xml:19
@@ -8457,12 +8554,11 @@ msgid ""
 "configuration</guimenu> on the red icon <placeholder type=\"inlinemediaobject"
 "\" id=\"1\"/> in the system tray."
 msgstr ""
-"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/>"
-"Κέντρο Ελέγχου Mageia και στην καρτέλα "
-"<emphasis role=\"bold\">Διαχείριση λογισμικού</emphasis>. Επίσης είναι "
-"διαθέσιμο με <guimenu>δεξί κλικ / διαμόρφωση ενημερώσεων</guimenu> στο "
-"κόκκινο εικονίδιο <placeholder type=\"inlinemediaobject\" id=\"1\"/> στο "
-"πλαίσιο συστήματος."
+"Αυτό το εργαλείο βρίσκεται στο <placeholder type=\"footnote\" id=\"0\"/"
+">Κέντρο Ελέγχου Mageia και στην καρτέλα <emphasis role=\"bold\">Διαχείριση "
+"λογισμικού</emphasis>. Επίσης είναι διαθέσιμο με <guimenu>δεξί κλικ / "
+"διαμόρφωση ενημερώσεων</guimenu> στο κόκκινο εικονίδιο <placeholder type="
+"\"inlinemediaobject\" id=\"1\"/> στο πλαίσιο συστήματος."
 
 #. type: Content of: <section><para>
 #: en/mgaapplet-config.xml:27
@@ -8507,8 +8603,8 @@ msgid ""
 "As you must have a mouse to install Mageia, that one is already installed by "
 "Drakinstall. This tool allows installation of another mouse."
 msgstr ""
-"Ένεκα της απαραίτητης χρήσης του ποντικιού για την εγκατάσταση της Mageia, το "
-"Drakinstall έχει φροντίσει για την εγκατάστασή του."
+"Ένεκα της απαραίτητης χρήσης του ποντικιού για την εγκατάσταση της Mageia, "
+"το Drakinstall έχει φροντίσει για την εγκατάστασή του."
 
 #. type: Content of: <section><para>
 #: en/mousedrake.xml:23
@@ -8606,8 +8702,8 @@ msgid ""
 "The first tab takes up the list of the different security tools with a "
 "button on the right side to configure them:"
 msgstr ""
-"Η πρώτη καρτέλα εμφανίζει τον κατάλογο με τα εργαλεία ασφάλειας με ένα κουμπί "
-"στα δεξιά για την διαμόρφωσή τους:"
+"Η πρώτη καρτέλα εμφανίζει τον κατάλογο με τα εργαλεία ασφάλειας με ένα "
+"κουμπί στα δεξιά για την διαμόρφωσή τους:"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/msecgui.xml:54
@@ -8646,8 +8742,8 @@ msgid ""
 "and another button to execute the checks just now."
 msgstr ""
 "την ημερομηνία των τελευταίων περιοδικών ελέγχων και ένα κουμπί για την "
-"προβολή μιας λεπτομερούς αναφοράς και ακόμα ένα κουμπί για την άμεση εκτέλεση "
-"των ελέγχων."
+"προβολή μιας λεπτομερούς αναφοράς και ακόμα ένα κουμπί για την άμεση "
+"εκτέλεση των ελέγχων."
 
 #. type: Content of: <section><section><title>
 #: en/msecgui.xml:86
@@ -10310,11 +10406,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Αυτό το εργαλείο<placeholder type=\"footnote\" id=\"0\"/> θα το βρείτε στην "
+"καρτέλα Δίκτυο &amp; Διαδίκτυο στο Κέντρο Ελέγχου Mageia με την ονομασία "
+"«Κέντρο δικτύου»"
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -10987,6 +11087,9 @@ msgstr ""
 "αποδοχή. Σε αυτή την περίπτωση, πρέπει να αποσυνδεθείτε και να "
 "επανασυνδεθείτε για να ενεργοποιηθεί η νέα παραμετροποίηση."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/es.po b/docs/mcc-help/es.po
index 9d3bab19..22abb635 100644
--- a/docs/mcc-help/es.po
+++ b/docs/mcc-help/es.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-31 16:00+0000\n"
 "Last-Translator: motitos\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -871,7 +871,95 @@ msgstr ""
 "y le da instrucciones para ello."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Establecer autologin para iniciar sesión automáticamente"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Puede iniciar esta herramienta desde la línea de comandos, escriba <emphasis "
+"role=\"bold\">drakauth</emphasis> como root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Esta herramienta <placeholder type=\"footnote\" id=\"0\"/>permite iniciar "
+"sesión automáticamente al mismo usuario, en su entorno/escritorio, sin pedir "
+"ninguna contraseña. Se llama autologin. Esto es generalmente buena idea "
+"cuando sólo hay un usuario que use la máquina."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Se encuentra en la pestaña <emphasis role=\"bold\">Arranque</emphasis> del "
+"Centro de Control de Mageia llamada \"Configurar el inicio de sesión "
+"automático\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Los botones son bastante obvios:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Marque <guibutton>Lanzar el entorno gráfico cuando su sistema inicia</"
+"guibutton>, si usted desea que el Sistema X Window sea ejecutado después del "
+"inicio. Si no es así el sistema iniciará en modo texto. De todos modos es "
+"posible lanzar la interfaz gráfica manualmente. Esto puede hacerse "
+"ejecutando el comando  'startx' o 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
+"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
+"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
+"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
+"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
+"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configurar el arranque"
 
@@ -881,23 +969,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Si está usando un ordenador con UEFI, la interfaz de usuario es ligeramente "
 "diferente ya que no se puede elegir el cargador de arranque (el primero de "
 "la lista desplegable) porque solamente hay uno disponible."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -911,9 +1000,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis> como root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -922,16 +1012,17 @@ msgstr ""
 "contraseña, "
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Se encuentra en la solapa Boot en el Centro de Control Mageia, como "
 "\"Configurar el sistema de arranque\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -940,15 +1031,16 @@ msgstr ""
 "Cambiar la configuración puede impedir el arranque de su computadora!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "En la primera parte, llamada <guilabel>Gestor de arranque</guilabel>, es "
 "posible elegir <guibutton>Usar un Gestor de arranque</guibutton>, Grub o "
@@ -961,12 +1053,21 @@ msgstr ""
 "de su computadora."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "En la segunda parte, llamada <guilabel>Opciones principales</guilabel>, "
@@ -978,7 +1079,7 @@ msgstr ""
 "el lapso establecido anteriormente."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -987,19 +1088,19 @@ msgstr ""
 "posible definir una contraseña."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "El botón <guibutton>Avanzadas</guibutton> permite seleccionar algunas otras "
 "opciones."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Activar ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1012,12 +1113,12 @@ msgstr ""
 "hardware es compatible con el estándar ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Activar SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1026,7 +1127,7 @@ msgstr ""
 "procesadores de varios núcleos. "
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1035,7 +1136,7 @@ msgstr ""
 "dual y activará SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1043,7 +1144,7 @@ msgstr ""
 "<guibutton>Habilitar APIC</guibutton> y <guibutton>APIC local:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1065,20 +1166,34 @@ msgstr ""
 "sistema.  En estos casos deshabilite el APIC y/o el LAPIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID de usuario</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "En la <guibutton>Próxima</guibutton> pantalla podrá ver una lista de las "
 "opciones disponibles durante el arranque del sistema.  La opción por defecto "
@@ -1089,13 +1204,13 @@ msgstr ""
 "Grub o modificar las existentes.  Para usar estas herramientas deberá estar "
 "familiarizado con Lilo o Grub."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1105,8 +1220,8 @@ msgstr ""
 "contenido que quiere que aparezca en el menú.  Coincidirá con el comando "
 "\"title\" del Grub.  Por ejemplo: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1114,8 +1229,8 @@ msgstr ""
 "El campo <guilabel>Imágen</guilabel> contiene el nombre del kernel.  "
 "Coincide con el comando \"kernel\" del Grub.  Por ejemplo /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1124,8 +1239,9 @@ msgstr ""
 "se encuentra almacenado el kernel.  Coincide con el comando \"root\" del "
 "Grub.  Por ejemplo (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1133,8 +1249,8 @@ msgstr ""
 "La etiqueta \"Anexar\" contiene las opciones que deben darse al kernel en el "
 "arranque."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1142,8 +1258,8 @@ msgstr ""
 "Si la casilla \"Por defecto\" está marcada, Grub arrancará desde esta "
 "entrada por defecto."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1156,90 +1272,64 @@ msgstr ""
 "y un <guilabel>perfil de red</guilabel>, véase <xref linkend=\"draknetprofile"
 "\"/>, en los menús desplegables."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Establecer autologin para iniciar sesión automáticamente"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID de usuario</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Puede lanzar esta herramienta desde la línea de comandos escribiendo "
-"<emphasis role=\"bold\">drakboot</emphasis> como root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Esta herramienta <placeholder type=\"footnote\" id=\"0\"/>permite iniciar "
-"sesión automáticamente al mismo usuario, en su entorno/escritorio, sin pedir "
-"ninguna contraseña. Se llama autologin. Esto es generalmente buena idea "
-"cuando sólo hay un usuario que use la máquina."
+"En la pantalla extra llamada <guilabel>Avanzado</guilabel>, es posible "
+"elegir el \n"
+" <guilabel>modo de Vídeo</guilabel>, un fichero  <guilabel>initrd</guilabel> "
+"y un <guilabel>perfil de red</guilabel>, véase <xref linkend=\"draknetprofile"
+"\"/>, en los menús desplegables."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Se encuentra en la pestaña <emphasis role=\"bold\">Arranque</emphasis> del "
-"Centro de Control de Mageia llamada \"Configurar el inicio de sesión "
-"automático\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Los botones son bastante obvios:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Marque <guibutton>Lanzar el entorno gráfico cuando su sistema inicia</"
-"guibutton>, si usted desea que el Sistema X Window sea ejecutado después del "
-"inicio. Si no es así el sistema iniciará en modo texto. De todos modos es "
-"posible lanzar la interfaz gráfica manualmente. Esto puede hacerse "
-"ejecutando el comando  'startx' o 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
-"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
-"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
-"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
-"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
-"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
-"guilabel>."
+"Puede lanzar esta herramienta desde la línea de comandos escribiendo "
+"<emphasis role=\"bold\">drakboot</emphasis> como root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2665,22 +2755,22 @@ msgstr ""
 "información al respecto."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Administrar particiones de disco"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk o diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2691,7 +2781,7 @@ msgstr ""
 "\"bold\">diskdrake</emphasis>."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2707,7 +2797,7 @@ msgstr ""
 "continuar."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2716,12 +2806,12 @@ msgstr ""
 "trabajar seleccionando la pestaña correcta (sda, sdb, sdc, etc)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2738,9 +2828,17 @@ msgstr ""
 "inferior es para borrar el disco completo, el resto de botones se hacen "
 "visibles a la derecha después de hacer clic en una partición."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2750,12 +2848,12 @@ msgstr ""
 "partición debe ser desmontada para poder hacer esto."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Solo se puede redimensionar una partición por su lado derecho"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2767,20 +2865,21 @@ msgstr ""
 "\"Crear\" aparece cuando se selecciona una parte vacía del disco."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Usted puede escoger un punto de montaje, si no existe será creado."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Seleccionando \"Cambiar a modo experto\", da algunas acciones adicionales "
@@ -2788,7 +2887,7 @@ msgstr ""
 "siguiente imagen."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7683,13 +7782,14 @@ msgstr "Configurar los pasos del arranque"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10639,10 +10739,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Esta herramienta <placeholder type=\"footnote\" id=\"0\"/> se encuentra bajo "
 "la pestaña <emphasis role=\"bold\">Sistema</emphasis> en el Centro de "
@@ -11454,3 +11555,6 @@ msgstr ""
 "pedirá confirmación. Todavía tendrá tiempo de cancelar todo y mantener la "
 "configuración previas, o aceptar. In este caso, tendrá que desconectarse y "
 "volverse a conectar para activar la nueva configuración."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/et.po b/docs/mcc-help/et.po
index 5a08cdd7..2018cffc 100644
--- a/docs/mcc-help/et.po
+++ b/docs/mcc-help/et.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-26 13:03+0300\n"
 "Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -834,7 +834,94 @@ msgstr ""
 "juhul andma ka täpsemat teavet, mida ja kuidas muuta."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Automaatse sisselogimise lubamine"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Tööriista saab käsurealt käivitada, kui anda administraatori õigustes käsk "
+"<emphasis role=\"bold\">drakauth</emphasis>."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Selle tööriistaga<placeholder type=\"footnote\" id=\"0\"/> saab lubada "
+"kasutajal logida oma töökeskkonda sisse, ilma et talt küsitaks parooli. Seda "
+"nimetatakse automaatseks sisselogimiseks (autologin). Ǜldiselt on see päris "
+"hea mõte, kui olete oma masina ainuke kasutaja."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Tööriista leiab Mageia juhtimiskeskuse paneelilt <emphasis role=\"bold"
+"\">Algkäivitus</emphasis>."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Akna valikud on üsna enesestmõistetavad:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Märkige <guibutton>X Windows käivitatakse alglaadimisel</guibutton>, kui "
+"soovite, et graafiline keskkond pandaks tööle kohe pärast alglaadimist. "
+"Vastasel juhul käivitub süsteem tekstirežiimis. Siiski on võimalik "
+"graafilist keskkonda ka käsitsi käivitada. Seda saab teha käsuga 'startx' "
+"või 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Kui esimene valik on märgitud, ilmub veel kaks valikut. Märkige "
+"<guibutton>Ei taha automaatselt siseneda</guibutton>, kui soovite, et "
+"süsteem küsiks endiselt, kes sisse logib (ja tema parooli), või "
+"<guibutton>Jah, soovin automaatset sisselogimist sellele (kasutajale, "
+"keskkonnale)</guibutton>, kui te soovite automaatselt sisse logida. Viimasel "
+"juhul tuleb määrata ka <guilabel>Vaikimisi kasutaja</guilabel> ja "
+"<guilabel>Vaikimisi töölaud</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Süsteemi käivitumise seadistamine"
 
@@ -844,23 +931,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Kui kasutate UEFI süstemi, on kasutajaliides pisut teistsugune, sest te ei "
 "saa valida alglaadurit (esimene hüpikmenüü): sel juhul on saadaval ainult "
 "üks alglaadur."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -874,9 +962,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis>."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -885,14 +974,15 @@ msgstr ""
 "süsteem jne.)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr "Tööriista leiab Mageia juhtimiskeskuses paneelilt \"Algkäivitus\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -901,15 +991,16 @@ msgstr ""
 "seadistuse hooletul muutmisel ei pruugi teie masin enam üldse käivituda!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Esimeses sektsioonis <guilabel>Alglaadur</guilabel> saab valida, milline on "
 "<guibutton>eelistatav alglaadur</guibutton>: Grub või LiLo, graafiline või "
@@ -920,12 +1011,21 @@ msgstr ""
 "tähendada, et teie masin enam ei käivitu."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Teises sektsioonis <guilabel>Põhivalikud</guilabel> saab määrata sekundites "
@@ -935,7 +1035,7 @@ msgstr ""
 "alglaadur ooteaja möödumisel vaikimisi süsteemi."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -943,18 +1043,18 @@ msgstr ""
 "Kolmandas sektsioonis <guibutton>Turvalisus</guibutton> saab määrata parooli."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Klõps nupule <guibutton>Muud valikud</guibutton> annab veel mõned valikud."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI lubamine:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -967,12 +1067,12 @@ msgstr ""
 "valik."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP lubamine:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -981,7 +1081,7 @@ msgstr ""
 "protsessorite arhitektuuri."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -990,7 +1090,7 @@ msgstr ""
 "protsessoriks ja lülitab SMP sisse."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -999,7 +1099,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1020,20 +1120,34 @@ msgstr ""
 "kohalik APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Kasutajakonto</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Ekraanil, mis avaneb nupule <guibutton>Edasi</guibutton> klõpsates, näeb "
 "kõiki alglaadimise ajal saadaolevaid kirjeid. Vaikimisi valik on tärniga. "
@@ -1043,13 +1157,13 @@ msgstr ""
 "uue kirje või muuta olemasolevat. Nende võimaluste kasutamiseks peate väga "
 "hästi tundma LiLot või Grubi."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1059,8 +1173,8 @@ msgstr ""
 "meelest peaks olema alglaadimismenüüs näha. See vastab Grubi käsule \"title"
 "\". Näide: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1068,8 +1182,8 @@ msgstr ""
 "Väli <guilabel>Laadefail</guilabel> sisaldab kerneli nime. See vastab Grubi "
 "käsule \"kernel\". Näide: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1077,8 +1191,9 @@ msgstr ""
 "Väli <guilabel>Juurpartitsioon</guilabel> sisaldab seadme nime, kuhu kernel "
 "on salvestatud. See vastab Grubi käsule \"root\". Näide: (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1086,8 +1201,8 @@ msgstr ""
 "Väli <guilabel>Lisaargumendid</guilabel> sisaldab võtmeid, mis antakse "
 "kernelile alglaadimise ajal."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1095,8 +1210,8 @@ msgstr ""
 "Kui märkida kastike <guilabel>Vaikimisi</guilabel>. laadib Grub selle kirje "
 "vaikimisi."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1105,92 +1220,66 @@ msgid ""
 msgstr ""
 "Lisaekraanil, mis avaneb klõpsuga nupule <guilabel>Muud valikud</guilabel>, "
 "saab valida <guilabel>ekraanilahutuse</guilabel>, <guilabel>initrd</"
-"guilabel>-faili ja <guilabel>võrguprofiili</guilabel> (<xref "
-"linkend=\"draknetprofile\"/>)."
-
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Automaatse sisselogimise lubamine"
+"guilabel>-faili ja <guilabel>võrguprofiili</guilabel> (<xref linkend="
+"\"draknetprofile\"/>)."
 
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Kasutajakonto</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Tööriista saab käsurealt käivitada, kui anda administraatori õigustes käsk "
-"<emphasis role=\"bold\">drakboot</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Selle tööriistaga<placeholder type=\"footnote\" id=\"0\"/> saab lubada "
-"kasutajal logida oma töökeskkonda sisse, ilma et talt küsitaks parooli. Seda "
-"nimetatakse automaatseks sisselogimiseks (autologin). Ǜldiselt on see päris "
-"hea mõte, kui olete oma masina ainuke kasutaja."
+"Lisaekraanil, mis avaneb klõpsuga nupule <guilabel>Muud valikud</guilabel>, "
+"saab valida <guilabel>ekraanilahutuse</guilabel>, <guilabel>initrd</"
+"guilabel>-faili ja <guilabel>võrguprofiili</guilabel> (<xref linkend="
+"\"draknetprofile\"/>)."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Tööriista leiab Mageia juhtimiskeskuse paneelilt <emphasis role=\"bold"
-"\">Algkäivitus</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Akna valikud on üsna enesestmõistetavad:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Märkige <guibutton>X Windows käivitatakse alglaadimisel</guibutton>, kui "
-"soovite, et graafiline keskkond pandaks tööle kohe pärast alglaadimist. "
-"Vastasel juhul käivitub süsteem tekstirežiimis. Siiski on võimalik "
-"graafilist keskkonda ka käsitsi käivitada. Seda saab teha käsuga 'startx' "
-"või 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Kui esimene valik on märgitud, ilmub veel kaks valikut. Märkige "
-"<guibutton>Ei taha automaatselt siseneda</guibutton>, kui soovite, et "
-"süsteem küsiks endiselt, kes sisse logib (ja tema parooli), või "
-"<guibutton>Jah, soovin automaatset sisselogimist sellele (kasutajale, "
-"keskkonnale)</guibutton>, kui te soovite automaatselt sisse logida. Viimasel "
-"juhul tuleb määrata ka <guilabel>Vaikimisi kasutaja</guilabel> ja "
-"<guilabel>Vaikimisi töölaud</guilabel>."
+"Tööriista saab käsurealt käivitada, kui anda administraatori õigustes käsk "
+"<emphasis role=\"bold\">drakboot</emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2591,22 +2680,22 @@ msgstr ""
 "hakata, sellele pole vaja rohkem midagi seletadagi."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Kettapartitsioonide haldamine"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk või diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2617,7 +2706,7 @@ msgstr ""
 "\">diskdrake</emphasis>."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2633,7 +2722,7 @@ msgstr ""
 "ikka jätkata."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2642,12 +2731,12 @@ msgstr ""
 "võtta, valida vastava kaardi (sda, sdb, sdc jne.) sakile klõpsates."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2663,9 +2752,17 @@ msgstr ""
 "kõik</guibutton></emphasis> saab tühjendada kogu ketta, teised nupud tulevad "
 "paremal nähtavale, kui olete klõpsanud partitsioonile."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2675,12 +2772,12 @@ msgstr ""
 "partitsioon esmalt lahutada."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Partitsiooni suurust saab muuta ainult selle paremal pool ehk lõpus."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2692,22 +2789,23 @@ msgstr ""
 "\">Tekita</guibutton> ilmub nähtavale, kui valida ketta tühi osa."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Kui soovite, võite valida ka haakepunkti, mida ei ole olemas. Sellisel juhul "
 "see haakepunkt luuakse."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Klõps nupule <emphasis><guibutton>Lülitu ekspertrežiimi</guibutton></"
@@ -2715,7 +2813,7 @@ msgstr ""
 "partitsioonile nime anda. Neid valikuid näeb alloleval pildil."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7543,13 +7641,14 @@ msgstr "Algkäivituse seadistamine"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10446,10 +10545,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Selle tööriista<placeholder type=\"footnote\" id=\"0\"/> leiab Mageia "
 "juhtimiskeskuses paneelilt <emphasis role=\"bold\">Süsteem</emphasis> kirje "
@@ -11244,6 +11344,9 @@ msgstr ""
 "jätkata endise seadistusega või siis need lõplikult kinnitada. Viimasel "
 "juhul tuleb uue seadistuse aktiveerimiseks graafiline keskkond taaskäivitada."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/eu.po b/docs/mcc-help/eu.po
index df5169ba..e3dfc475 100644
--- a/docs/mcc-help/eu.po
+++ b/docs/mcc-help/eu.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-25 18:32+0100\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
@@ -840,7 +840,100 @@ msgstr ""
 "eta jarraian hori egiteko argibideak ematen badizkizu."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Gaitu saio hasiera automatikoa saioa automatikoki hasi dadin"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Komando-lerrotik tresna hau abiaraz dezakezu, <emphasis role=\"bold"
+"\">drakauth</emphasis> root bezala idatziz."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Tresna hau<placeholder type=\"footnote\" id=\"0\"/> zure ingurune/"
+"mahaigainean erabiltzaile berari automatikoki konektatzeko aukera ematen "
+"dio, edozein pasahitz eskatu gabe. Autologin izenekoa. Hau ideia ona izan "
+"ohi da, han makina erabiltzeko erabiltzaile bakar bat badago."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Mageia Kontrol Guneko <emphasis role=\"bold\">Abio</emphasis> erlaitzean "
+"kokatuta \"Saio-hasiera automatikoa itxuratzea\" deiturik."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Interfaze botoiak nahiko bistakoak dira:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Egiaztatu <guibutton>Abiarazi ingurune grafikoa zure sistema abiaraztean</"
+"guibutton>, X Window Sistema hasi ondoren exekutatzea nahi izanez gero. "
+"Horrela ez bada sistema testu moduan hasiko da. Dena den, posible da GUI-a "
+"eskuz abiaraztea. Hau 'startx' edo 'systemctl start dm' komandoa exekutatzen "
+"egin daiteke."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
+"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
+"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
+"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
+"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
+"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
+"guilabel>.Lehengo laukia aktibatuta baldin badago, beste bi aukera agertuko "
+"dira. Markatu <guibutton>Ez, nik ez dut autologin-ik nahi</guibutton>, "
+"sistemak erabiltzailea eta pasahitza eskatzea nahi baduzu, edo "
+"<guibutton>Bai, (erabiltzaile, idazmahai) honekin automatikoki sartzea nahi "
+"dut</guibutton>, beharrezkoa bada. Horrelakoetan, <guilabel>lehenetsitako "
+"erabiltzaile izena</guilabel> hornitzea behar duzu baita "
+"<guilabel>lehenetsitako idazmahaia</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Ezarri abio sistema"
 
@@ -850,23 +943,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Zuk UEFI sistema bat erabiltzen ari bazara, erabiltzaile interfazearen "
 "zertxobait ezberdina da, ezin duzu abiarazlea aukeratu (lehen goitibeherako "
 "menua) ez baitago erabilgarri besterik."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -880,9 +974,10 @@ msgstr ""
 "\">drakboot --boot</emphasis> root bezala idatziz."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -891,16 +986,17 @@ msgstr ""
 "definitzea, lehenetsitako abioa, etab.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Mageia Kontrol Gunean \"Konfiguratu abio sistema\" etiketa pean aurkitu da "
 "Abioa."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -909,15 +1005,16 @@ msgstr ""
 "Konfigurazio aldatzeak zure konputagailuaren abioa galaraz dezake!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Lehenengo zatian, <guilabel>abioko kudeatzailea</guilabel> izenekoa, "
 "aukeratu dezakezu <guibutton>abioko kargatzailea Kudeatzaile bat erabiltzea</"
@@ -929,12 +1026,21 @@ msgstr ""
 "ordenagailua abiaraztea sahiestu dezake."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "En la segunda parte, llamada <guilabel>Opciones principales</guilabel>, "
@@ -952,7 +1058,7 @@ msgstr ""
 "ezarritako epea amaitu ondoren."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -961,19 +1067,19 @@ msgstr ""
 "deiturikoa, pasahitz bat definitzea posiblea da."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Botoi <guibutton>Aurreratuak</guibutton>  beste aukera batzuk aukeratzea "
 "baimentzen du."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Gaitu ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -986,12 +1092,12 @@ msgstr ""
 "zure hardwarea ACPI estandarrarekin bateragarria bada."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Gaitu SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1000,7 +1106,7 @@ msgstr ""
 "prozesadoreetarako arkitektura da."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1009,7 +1115,7 @@ msgstr ""
 "bezala ikusiko du eta SMP-a aktibatuko du."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1018,7 +1124,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1039,20 +1145,34 @@ msgstr ""
 "APIC lokal desaktibatu."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Saioa hastko ID-a</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "En la <guibutton>Próxima</guibutton> pantalla podrá ver una lista de las "
 "opciones disponibles durante el arranque del sistema.  La opción por defecto "
@@ -1069,13 +1189,13 @@ msgstr ""
 "bat agertuko da Grub-en menuan sarrerak gehitzeko edo daudenak aldatzeko "
 "aukera emanez. "
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1085,8 +1205,8 @@ msgstr ""
 "menuan agertzea nahi duzun edukia. Grub \"title\"  komandoarekin bat  dator. "
 "Adibidez: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1094,8 +1214,8 @@ msgstr ""
 "<guilabel>Irudi</guilabel> eremuak nukleoa gordetzen duen gailuaren izena "
 "dauka. Grub-en \"kernel\"  komandoarekin bat dator. Adibidez  /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1103,16 +1223,17 @@ msgstr ""
 "<guilabel>Root</guilabel> eremuak nukleoa gordetzen duen gailuaren izena "
 "dauka. Grub-en \"root\" komandoarekin bat dator. Adibidez (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
 msgstr ""
 "\"Eranstea\" etiketak kernel-ari abioan eman behar zaizkion aukerak dauzka."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1120,8 +1241,8 @@ msgstr ""
 "\"lehenetsia\" Kutxa hautatuta badago, GRUB sarrera hau hasieratuko du modu "
 "lehenetsian."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1133,95 +1254,63 @@ msgstr ""
 "guilabel> fitxategia bat eta <guilabel>sare-profila</guilabel>, ikus <xref "
 "linkend=\"draknetprofile\"/>, goitibeherako zerrendetan."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Gaitu saio hasiera automatikoa saioa automatikoki hasi dadin"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Saioa hastko ID-a</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Komando-lerrotik tresna hau abiaraz dezakezu, <emphasis role=\"bold"
-"\">drakboot</emphasis> root bezala idatziz."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Tresna hau<placeholder type=\"footnote\" id=\"0\"/> zure ingurune/"
-"mahaigainean erabiltzaile berari automatikoki konektatzeko aukera ematen "
-"dio, edozein pasahitz eskatu gabe. Autologin izenekoa. Hau ideia ona izan "
-"ohi da, han makina erabiltzeko erabiltzaile bakar bat badago."
+"<guilabel>Aurreratua</guilabel> izeneko aparteko pantailan, posible da "
+"<guilabel>Bideo-modua</guilabel> aukeratu ahal izatea, <guilabel>initrd</"
+"guilabel> fitxategia bat eta <guilabel>sare-profila</guilabel>, ikus <xref "
+"linkend=\"draknetprofile\"/>, goitibeherako zerrendetan."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Mageia Kontrol Guneko <emphasis role=\"bold\">Abio</emphasis> erlaitzean "
-"kokatuta \"Saio-hasiera automatikoa itxuratzea\" deiturik."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Interfaze botoiak nahiko bistakoak dira:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Egiaztatu <guibutton>Abiarazi ingurune grafikoa zure sistema abiaraztean</"
-"guibutton>, X Window Sistema hasi ondoren exekutatzea nahi izanez gero. "
-"Horrela ez bada sistema testu moduan hasiko da. Dena den, posible da GUI-a "
-"eskuz abiaraztea. Hau 'startx' edo 'systemctl start dm' komandoa exekutatzen "
-"egin daiteke."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la primera casilla está activada, otras dos opciones aparecen. Marque o "
-"bien <guibutton>No, yo no quiero autologin </guibutton>, si desea que el "
-"sistema pida un usuario y contraseña, o bien <guibutton>Sí, deseo entrar "
-"automáticaticamente con este (usuario, escritorio)</guibutton>, si es "
-"necesario. En este caso, también necesita  suministrar el <guilabel>nombre "
-"de usuario por defecto </guilabel> y el <guilabel>escritorio por defecto</"
-"guilabel>.Lehengo laukia aktibatuta baldin badago, beste bi aukera agertuko "
-"dira. Markatu <guibutton>Ez, nik ez dut autologin-ik nahi</guibutton>, "
-"sistemak erabiltzailea eta pasahitza eskatzea nahi baduzu, edo "
-"<guibutton>Bai, (erabiltzaile, idazmahai) honekin automatikoki sartzea nahi "
-"dut</guibutton>, beharrezkoa bada. Horrelakoetan, <guilabel>lehenetsitako "
-"erabiltzaile izena</guilabel> hornitzea behar duzu baita "
-"<guilabel>lehenetsitako idazmahaia</guilabel>."
+"Komando-lerrotik tresna hau abiaraz dezakezu, <emphasis role=\"bold"
+"\">drakboot</emphasis> root bezala idatziz."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2638,22 +2727,22 @@ msgstr ""
 "informazio gehiago behar duzunik."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Kudeatu disko partizioak"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk edo diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2664,7 +2753,7 @@ msgstr ""
 "bezala idatziz."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2680,7 +2769,7 @@ msgstr ""
 "seguru ez bazaude."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2689,12 +2778,12 @@ msgstr ""
 "gogorrera aldatu zaitezke fitxa zuzena aukeratuz (sda, sdb, sdc etab)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2711,9 +2800,17 @@ msgstr ""
 "ezabatzeko da, gainerako botoiak eskuinean egiten dira ikusgai  partizio "
 "batean klik egin ondoren."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2723,12 +2820,12 @@ msgstr ""
 "desmuntatua izan behar da hori egin ahal izateko."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Soilik posible da partizio tamaina aldatzea bere eskuinaldean"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2741,22 +2838,23 @@ msgstr ""
 "dagoenean"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Existitzen ez den muntai puntu bat aukeratu ahal izango baduzu, sortu egingo "
 "da."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
@@ -2764,7 +2862,7 @@ msgstr ""
 "seen in the screenshot below."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7632,13 +7730,14 @@ msgstr "Konfiguratu abioaren urratsak"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10561,10 +10660,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Tresna hau<placeholder type=\"footnote\" id=\"0\"/> <emphasis role=\"bold"
 "\">Sistema</emphasis> fitxa azpian aurkitzen da Mageia Kontrol Gunean "
@@ -11371,3 +11471,6 @@ msgstr ""
 "baieztatzeko eskatuko dizu. Denbora dago guztia bertan behera uzteko eta "
 "aurreko konfigurazioa mantentzeko, edo onartzeko. Kasu honetan, deskonektatu "
 "eta berriz ere konektatu behar duzu Konfigurazio berria gaitzeko."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/fr.po b/docs/mcc-help/fr.po
index f8845fd9..5e3f3926 100644
--- a/docs/mcc-help/fr.po
+++ b/docs/mcc-help/fr.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-24 14:29+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -864,7 +864,96 @@ msgstr ""
 "système invite à le faire et donne les informations nécessaires à ce sujet."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Configurer la connexion automatique"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Il est possible de lancer cet outil depuis la ligne de commande en tapant "
+"sous root : <emphasis role=\"bold\">drakauth</emphasis>."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Cet outil<placeholder type=\"footnote\" id=\"0\"/> permet de connecter "
+"automatiquement à chaque démarrage un utilisateur particulier, dans son "
+"environnement de bureau, sans lui demander son mot de passe. Cela s'appelle "
+"la connexion automatique. C'est généralement une bonne idée sur une machine "
+"qui ne possède qu'un seul utilisateur."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Il se trouve dans l'onglet <emphasis role=\"bold\">Démarrage</emphasis> du "
+"Centre de Contrôle de Mageia, sous l'appellation \"Configurer la connexion "
+"automatique\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Les boutons de l'interface sont assez évidents :"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Cochez <guibutton>Lancer l'environnement graphique au démarrage du système</"
+"guibutton>, si vous désirez que le serveur graphique soit exécuté au "
+"démarrage. Dans le cas contraire, le système démarrera en mode texte. "
+"Cependant il sera toujours possible de lancer l'interface graphique "
+"manuellement, en exécutant la commande 'startx' ou 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Si la première case est cochée, deux autres options sont disponibles, cocher "
+"soit <guibutton> Ne pas connecter automatiquement un utilisateur</"
+"guibutton>, pour que le système continue à demander quel utilisateur "
+"connecter (avec le mot de passe) ou bien cocher <guibutton> Connexion "
+"automatique (choisir utilisateur et bureau)</guibutton>. Dans ce cas, il est "
+"aussi nécessaire de fournir le nom de l'<guilabel>Utilisateur par défaut</"
+"guilabel> et le <guilabel>Bureau par défaut</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configurer le démarrage du système"
 
@@ -874,23 +963,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Si vous utilisez un système UEFI, l'interface utilisateur est légèrement "
 "différente. En effet vous ne pouvez pas choisir le chargeur de démarrage "
 "(première liste déroulante) car un seul est disponible."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -904,9 +994,10 @@ msgstr ""
 "sous root : <emphasis role=\"bold\">drakboot--boot</emphasis>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -915,16 +1006,17 @@ msgstr ""
 "passe, l'amorçage par défaut etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "On le trouve dans l'onglet Démarrage du Centre de Contrôle de Mageia, sous "
 "la désignation \"Configurer le démarrage du système\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -933,15 +1025,16 @@ msgstr ""
 "modification de certains éléments peut interdire tout nouvel amorçage !"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Dans la première partie, appelée <guilabel>Programme d'amorçage</guilabel>, "
 "il est possible de choisir quel <guibutton>Programme d'amorçage à utiliser</"
@@ -953,12 +1046,21 @@ msgstr ""
 "interdire l'amorçage de la machine."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Dans la seconde partie, appelée <guilabel>Options principales</guilabel>,se "
@@ -969,7 +1071,7 @@ msgstr ""
 "défaut qui sera amorcée une fois le délai expiré."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -978,18 +1080,18 @@ msgstr ""
 "autorise la mise en place d'un mot de passe."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Le bouton <guibutton>Avancé</guibutton> propose des options supplémentaires."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Activer l'ACPI :</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1002,12 +1104,12 @@ msgstr ""
 "Cocher cette case si le matériel est compatible ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Activer le SMP :</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1016,7 +1118,7 @@ msgstr ""
 "processeurs multicores."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1025,7 +1127,7 @@ msgstr ""
 "des processeurs dual core et active le SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1034,7 +1136,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1056,20 +1158,34 @@ msgstr ""
 "l'APIC local."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Identifiant de connexion</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Dans l'écran <guibutton>Suivant</guibutton>, se trouve la liste de toutes "
 "les entrées du menu d'amorçage, celle par défaut est repérée par un "
@@ -1080,13 +1196,13 @@ msgstr ""
 "le menu d'amorçage ou la modification d'une entrée existante. Il faut bien "
 "connaître Lilo ou Grub pour être capable d'utiliser ces outils."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1096,8 +1212,8 @@ msgstr ""
 "souhaite voir affiché dans le menu. Il correspond à la commande \"title\" de "
 "grub. Par exemple : Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1105,8 +1221,8 @@ msgstr ""
 "Le champ <guilabel>Image</guilabel> contient le nom du noyau. Il correspond "
 "à la commande \"kernel\" de Grub. Par exemple /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1115,8 +1231,9 @@ msgstr ""
 "périphérique où est enregistré le noyau. Il correspond à la commande \"root"
 "\".  Par exemple : (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1124,8 +1241,8 @@ msgstr ""
 "Le champ<guilabel> Options passées au noyau</guilabel> contient les options "
 "à passer au noyau pendant l'amorçage."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1133,8 +1250,8 @@ msgstr ""
 "Si la case <guilabel>Choix par défaut</guilabel> est cochée, Grub amorcera "
 "cette entrée par défaut."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1146,91 +1263,63 @@ msgstr ""
 "<guilabel>initrd</guilabel> et un <guilabel>profil réseau</guilabel> "
 "(consulter <xref linkend=\"draknetprofile\"/>), dans les listes déroulantes."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Configurer la connexion automatique"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Identifiant de connexion</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Il est possible de lancer cet outil depuis la ligne de commande en tapant "
-"sous root : <emphasis role=\"bold\">drakboot</emphasis>."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Cet outil<placeholder type=\"footnote\" id=\"0\"/> permet de connecter "
-"automatiquement à chaque démarrage un utilisateur particulier, dans son "
-"environnement de bureau, sans lui demander son mot de passe. Cela s'appelle "
-"la connexion automatique. C'est généralement une bonne idée sur une machine "
-"qui ne possède qu'un seul utilisateur."
+"Dans l'écran supplémentaire appelé <guilabel>Avancé</guilabel>, il est "
+"possible de choisir le <guilabel>mode Vidéo</guilabel>, un fichier "
+"<guilabel>initrd</guilabel> et un <guilabel>profil réseau</guilabel> "
+"(consulter <xref linkend=\"draknetprofile\"/>), dans les listes déroulantes."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Il se trouve dans l'onglet <emphasis role=\"bold\">Démarrage</emphasis> du "
-"Centre de Contrôle de Mageia, sous l'appellation \"Configurer la connexion "
-"automatique\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Les boutons de l'interface sont assez évidents :"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Cochez <guibutton>Lancer l'environnement graphique au démarrage du système</"
-"guibutton>, si vous désirez que le serveur graphique soit exécuté au "
-"démarrage. Dans le cas contraire, le système démarrera en mode texte. "
-"Cependant il sera toujours possible de lancer l'interface graphique "
-"manuellement, en exécutant la commande 'startx' ou 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Si la première case est cochée, deux autres options sont disponibles, cocher "
-"soit <guibutton> Ne pas connecter automatiquement un utilisateur</"
-"guibutton>, pour que le système continue à demander quel utilisateur "
-"connecter (avec le mot de passe) ou bien cocher <guibutton> Connexion "
-"automatique (choisir utilisateur et bureau)</guibutton>. Dans ce cas, il est "
-"aussi nécessaire de fournir le nom de l'<guilabel>Utilisateur par défaut</"
-"guilabel> et le <guilabel>Bureau par défaut</guilabel>."
+"Il est possible de lancer cet outil depuis la ligne de commande en tapant "
+"sous root : <emphasis role=\"bold\">drakboot</emphasis>."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2672,22 +2761,22 @@ msgstr ""
 "besoin de plus d'informations à ce sujet."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gérer les partitions de vos disques durs"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk or diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2698,7 +2787,7 @@ msgstr ""
 "\"bold\">diskdrake</emphasis>."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2714,7 +2803,7 @@ msgstr ""
 "confiant pour la suite."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2724,12 +2813,12 @@ msgstr ""
 "sdc, etc.)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2746,9 +2835,17 @@ msgstr ""
 "emphasis> en bas sert à effacer la totalité du disque, les autres boutons "
 "deviennent visibles sur la droite dès qu'une partition est sélectionnée."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2758,13 +2855,13 @@ msgstr ""
 "Pour pouvoir le faire, il faut d'abord la démonter."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Le redimensionnement d'une partition n'est possible que vers sa droite."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2777,22 +2874,23 @@ msgstr ""
 "du disque est sélectionnée."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Il est possible de choisir un point de montage qui n'existe pas, il sera "
 "créé."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Sélectionner <emphasis><guibutton> Passer en mode expert </guibutton></"
@@ -2801,7 +2899,7 @@ msgstr ""
 "d'écran ci-dessous."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7727,13 +7825,14 @@ msgstr "Configurer les étapes du démarrage"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10692,10 +10791,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Cet outil <placeholder type=\"footnote\" id=\"0\"/> se trouve dans l'onglet "
 "<emphasis role=\"bold\">Système</emphasis> du Centre de Contrôle de Mageia "
@@ -11510,3 +11610,6 @@ msgstr ""
 "la configuration précédente, ou acceptez la modification. Dans ce dernier "
 "cas, vous devrez vous déconnecter et vous reconnecter pour activer la "
 "nouvelle configuration."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/id.po b/docs/mcc-help/id.po
index 962be6fb..b0f2d460 100644
--- a/docs/mcc-help/id.po
+++ b/docs/mcc-help/id.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-25 04:40+0000\n"
 "Last-Translator: Kiki <kiki.syahadat@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -840,7 +840,95 @@ msgstr ""
 "melakukannya dan berikan informasi tetangnya."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Mengatur autologin untuk masuk otomatis"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Anda bisa menjalankan alat ini dari baris perintah, dengan mengetik "
+"<emphasis role=\"bold\">drakauth</emphasis> sebagai root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Alat ini<placeholder type=\"footnote\" id=\"0\"/> memungkinkan Anda untuk "
+"masuk otomatis dengan pengguna yang sama, ke lingkungan desktop, tanpa "
+"ditanya sandi apapun. Ini disebut autologin.  Ini bagus ketika hanya ada "
+"satu pengguna di komputer."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Ini ada di tab <emphasis role=\"bold\">Boot</emphasis> pada Pusat Kendali "
+"Mageia dengan nama \"Atur autologin untuk masuk otomatis\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Tombol antarmuka sangat jelas:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Centang <guibutton>Jalankan lingkungan grafis ketika sistem dimulai</"
+"guibutton>, jika Anda ingin Sistem X Window dijalankan setelah komputer "
+"dinyalakan. Jika tidak, sistem akan dimulai dalam mode teks. Meski demikian, "
+"akan tetap mungkin untuk menjalankan antarmuka grafis secara manual. Ini "
+"bisa dilakukan dengan menjalankan perintah 'startx' atau 'systemctl start "
+"dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Jika kotak pertama ditandai, dua pilihan lainnya akan tersedia, tandai "
+"antara <guibutton>Tidak, saya tidak ingin autologin</guibutton>, jika Anda "
+"ingin sistem terus menanyakan pengguna mana yang ingin terhubung (dan sandi) "
+"atau tandai <guibutton>Ya, saya ingin autologin dengan (pengguna, desktop) "
+"ini</guibutton>, jika diperlukan. Untuk yang ini, Anda juga harus menentukan "
+"<guilabel>Nama pengguna baku</guilabel> dan <guilabel>Desktop baku</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Mengatur sistem boot"
 
@@ -850,23 +938,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Jika Anda menggunakan sistem UEFI, antarmuka pengguna akan sangat berbeda "
 "karena Anda tidak bisa memilih boot loader (daftar tarik ulur pertama) "
 "karena hanya satu yang tersedia."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -880,9 +969,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis> sebagai root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -891,16 +981,17 @@ msgstr ""
 "dll.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Ini ada di tab Boot pada Pusat Kendali Mageia dengan nama \"Atur sistem boot"
 "\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -909,15 +1000,16 @@ msgstr ""
 "beberapa pengaturan bisa mencegah komputer untuk berjalan!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Di bagian pertama, disebut <guilabel>Bootloader</guilabel>, sangat "
 "dimungkinkan untuk memilih <guibutton>Bootloader yang digunakan</guibutton>, "
@@ -928,12 +1020,21 @@ msgstr ""
 "saja mencegah komputer untuk berjalan."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Bagian kedua, disebut <guilabel>Pilihan utama</guilabel>, Anda bisa mengatur "
@@ -943,7 +1044,7 @@ msgstr ""
 "akan menjalankan sistem baku setelah waktu jeda terlewati."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -952,18 +1053,18 @@ msgstr ""
 "bisa mengatur sandi."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Tombol <guibutton>Lanjutan</guibutton> memberikan beberapa pilihan tambahan."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Hidupkan ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -976,12 +1077,12 @@ msgstr ""
 "ini jika hardware Anda cocok dengan ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Hidupkan SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -990,7 +1091,7 @@ msgstr ""
 "prosesor dengan banyak inti."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -999,7 +1100,7 @@ msgstr ""
 "sebagai dual processor dan menghidupkan SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1008,7 +1109,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1029,20 +1130,34 @@ msgstr ""
 "ini, matikan APIC dan/atau Local APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID Login</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Di layar <guibutton>Selanjutnya</guibutton>, Anda bisa melihat semua daftar "
 "entri yang tersedia saat komputer dijalankan. Pilihan baku adalah yang "
@@ -1053,13 +1168,13 @@ msgstr ""
 "memodifikasi yang sudah ada. Anda harus mengenal Lilo atau Grub untuk "
 "menggunakan peralatan ini."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1069,8 +1184,8 @@ msgstr ""
 "ditampilkan di menu. Ini sama dengan perintah Grub \"title\". Contohnya: "
 "Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1078,8 +1193,8 @@ msgstr ""
 "Kolom <guilabel>Image</guilabel> berisi nama kernel. Ini sama dengan "
 "perintah Grub \"kernel\". Contohnya /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1087,8 +1202,9 @@ msgstr ""
 "Kolom <guilabel>Root</guilabel> berisi nama perangkat di mana kernel "
 "tersimpan. Ini sama dengan perintah Grub \"root\". Contohnya (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1096,8 +1212,8 @@ msgstr ""
 "Kolom <guilabel>Tambahan</guilabel> berisi pilihan yang diberikan ke kernel "
 "saat komputer dijalankan."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1105,8 +1221,8 @@ msgstr ""
 "Jika kotak <guilabel>Baku</guilabel> ditandai, Grub akan menjalankan entri "
 "ini sebagai pilihan baku."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1118,90 +1234,63 @@ msgstr ""
 "guilabel> dan <guilabel>profil jaringan</guilabel>, lihat <xref linkend="
 "\"draknetprofile\"/> dalam daftar tarik ulur."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Mengatur autologin untuk masuk otomatis"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID Login</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Anda bisa menjalankan alat ini dari baris perintah, dengan mengetik "
-"<emphasis role=\"bold\">drakboot</emphasis> sebagai root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Alat ini<placeholder type=\"footnote\" id=\"0\"/> memungkinkan Anda untuk "
-"masuk otomatis dengan pengguna yang sama, ke lingkungan desktop, tanpa "
-"ditanya sandi apapun. Ini disebut autologin.  Ini bagus ketika hanya ada "
-"satu pengguna di komputer."
+"Dalam layar tambahan yang disebut <guilabel>Lanjutan</guilabel> dimungkinkan "
+"untuk memilih <guilabel>mode Video</guilabel>, file <guilabel>initrd</"
+"guilabel> dan <guilabel>profil jaringan</guilabel>, lihat <xref linkend="
+"\"draknetprofile\"/> dalam daftar tarik ulur."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Ini ada di tab <emphasis role=\"bold\">Boot</emphasis> pada Pusat Kendali "
-"Mageia dengan nama \"Atur autologin untuk masuk otomatis\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Tombol antarmuka sangat jelas:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Centang <guibutton>Jalankan lingkungan grafis ketika sistem dimulai</"
-"guibutton>, jika Anda ingin Sistem X Window dijalankan setelah komputer "
-"dinyalakan. Jika tidak, sistem akan dimulai dalam mode teks. Meski demikian, "
-"akan tetap mungkin untuk menjalankan antarmuka grafis secara manual. Ini "
-"bisa dilakukan dengan menjalankan perintah 'startx' atau 'systemctl start "
-"dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Jika kotak pertama ditandai, dua pilihan lainnya akan tersedia, tandai "
-"antara <guibutton>Tidak, saya tidak ingin autologin</guibutton>, jika Anda "
-"ingin sistem terus menanyakan pengguna mana yang ingin terhubung (dan sandi) "
-"atau tandai <guibutton>Ya, saya ingin autologin dengan (pengguna, desktop) "
-"ini</guibutton>, jika diperlukan. Untuk yang ini, Anda juga harus menentukan "
-"<guilabel>Nama pengguna baku</guilabel> dan <guilabel>Desktop baku</"
-"guilabel>."
+"Anda bisa menjalankan alat ini dari baris perintah, dengan mengetik "
+"<emphasis role=\"bold\">drakboot</emphasis> sebagai root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2607,22 +2696,22 @@ msgstr ""
 "lebih untuk ini."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Kelola partisi disk"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk atau diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2633,7 +2722,7 @@ msgstr ""
 "\">diskdrake</emphasis> sebagai root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2648,7 +2737,7 @@ msgstr ""
 "emphasis> jika Anda tidak ingin melanjutkan."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2657,12 +2746,12 @@ msgstr ""
 "disk yang Anda inginkan dengan memilih tab yang benar (sda, sdb, sdc, dst)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2679,9 +2768,17 @@ msgstr ""
 "tombol lainnya akan muncul di sebelah kanan setelah Anda mengklik sebuah "
 "partisi."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2691,12 +2788,12 @@ msgstr ""
 "semua itu, partisi harus dilepas terlebih dahulu."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Mengubah ukuran hanya bisa pada sisi sebelah kanan partisi"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2708,21 +2805,22 @@ msgstr ""
 "role=\"bold\">Buat</guibutton> muncul ketika bagian disk kosong dipilih"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Anda bisa memilih titik mount yang belum ada yang kemudian akan dibuatkan."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Memilih <emphasis><guibutton>Beralih ke mode ahli</guibutton></emphasis> "
@@ -2730,7 +2828,7 @@ msgstr ""
 "seperti yang bisa dilihat pada gambar di bawah."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7562,13 +7660,14 @@ msgstr "Konfigurasi langkah boot"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10470,10 +10569,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Alat ini<placeholder type=\"footnote\" id=\"0\"/> ada di tab <emphasis role="
 "\"bold\">Sistem</emphasis> pada Pusat Kendali Mageia dengan nama "
@@ -11262,3 +11362,6 @@ msgstr ""
 "kepada Anda untuk mengkonfirmasi. Masih ada waktu untuk membatalkan semua "
 "dan menjaga konfigurasi sebelumnya, atau menerimanya. Dalam hal ini, Anda "
 "harus memutuskan dan menyambungkan ulang untuk mengaktifkan konfigurasi baru."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/it.po b/docs/mcc-help/it.po
index 480724f0..0d1f6761 100644
--- a/docs/mcc-help/it.po
+++ b/docs/mcc-help/it.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-12 20:32+0000\n"
 "Last-Translator: Roberto Albano <randyichinose@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/mageia/language/"
@@ -783,7 +783,76 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Imposta l'accesso automatico"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Puoi avviare questo tool da linea di comando scrivendo <emphasis role=\"bold"
+"\">drakconnect</emphasis> come root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "I bottoni di interfaccia sono piuttosto semplici:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configura l'avvio del sistema"
 
@@ -793,20 +862,20 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -818,22 +887,29 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
+"Questo strumento<placeholder type=\"footnote\" id=\"0\"/> ti permette di "
+"accedere alla console che viene automaticamente aperta come root. Non "
+"pensiamo che tu debba sapere altro al riguardo."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
+"Si trova nel Centro di Controllo di Mageia, nella scheda Dischi Locali, "
+"etichettata \"Condividi le partizioni del disco fisso\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -843,46 +919,54 @@ msgstr ""
 "boot!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+msgid ""
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -891,12 +975,12 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Abilita SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -905,7 +989,7 @@ msgstr ""
 "multicore."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -914,14 +998,14 @@ msgstr ""
 "dual e abiliterà SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -934,65 +1018,79 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
 msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID di accesso</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+msgid ""
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
+msgstr ""
+
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
 "example: Mageia3."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1000,68 +1098,55 @@ msgid ""
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Imposta l'accesso automatico"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID di accesso</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "I bottoni di interfaccia sono piuttosto semplici:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2301,22 +2386,22 @@ msgstr ""
 "pensiamo che tu debba sapere altro al riguardo."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gestisci le partizioni del disco"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk o diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2327,7 +2412,7 @@ msgstr ""
 "\">diskdrake</emphasis>"
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2337,19 +2422,19 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2359,21 +2444,29 @@ msgid ""
 "the other buttons become visible on the right after you click on a partition."
 msgstr ""
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2382,25 +2475,25 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Puoi scegliere un punto di mount inesistente, verrà creato."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -6453,13 +6546,14 @@ msgstr "Configura la sequenza di avvio"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -8877,11 +8971,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Questo strumento<placeholder type=\"footnote\" id=\"0\"/> lo trovi nel "
+"Centro di Controllo di Mageia, nel tab Condivisioni di rete, etichettato "
+"<guilabel>Configura condivisioni WebDAV</guilabel>."
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -9520,3 +9618,6 @@ msgid ""
 "previous configuration, or to accept. In this case, you have to disconnect "
 "and reconnect to activate the new configuration."
 msgstr ""
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/nl.po b/docs/mcc-help/nl.po
index a86de8ce..c64efe13 100644
--- a/docs/mcc-help/nl.po
+++ b/docs/mcc-help/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-09-16 16:40+0200\n"
 "Last-Translator: Marja van Waes <marja@mageia.org>\n"
 "Language-Team: Dutch <i18n-nl@ml.mageia.org>\n"
@@ -842,7 +842,94 @@ msgstr ""
 "en er informatie over geeft."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Automatische aanmelding instellen"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
+"\"bold\">drakauth</emphasis> te typen."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Deze tool<placeholder type=\"footnote\" id=\"0\"/> laat één gebruiker "
+"automatisch inloggen op zijn/haar werkomgeving, zonder een wachtwoord te "
+"hoeven geven. Dat heet autologin.  Dit kan een goed idee zijn als het "
+"systeem slechts door één persoon gebruikt wordt."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"U vindt hem in het <emphasis role=\"bold\">Opstarten</emphasis>-tabblad van "
+"het Mageia-configuratiecentrum, het heet \"Automatische aanmelding instellen"
+"\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "De knoppen van de interface spreken voor zich:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Vink <guibutton>Open het X-Windowsysteem bij opstarten</guibutton> aan, als "
+"u wilt dat het X-Windowsysteem bij het opstarten wordt uitgevoerd. Zo niet, "
+"dan start de computer in tekstmodus. Overigens kan de grafische omgeving dan "
+"handmatig gestart worden, met het commando 'startx' of 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Als het eerste hokje is aangevinkt, zijn er nog twee opties beschikbaar. "
+"Vink <guibutton>Nee, ik wil niet automatisch aanmelden</guibutton> aan, als "
+"u een inlogscherm wilt krijgen waarin om gebruiker en wachtwoord gevraagd "
+"wordt. Kies anders <guibutton>Ja, ik wil automatisch aanmelden met deze "
+"(gebruiker, werkomgeving)</guibutton>. In dat geval dient u ook de "
+"<guilabel>Standaard gebruiker</guilabel> en <guilabel>Standaard "
+"werkomgeving</guilabel> te kiezen."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Stel het opstartsysteem in"
 
@@ -852,23 +939,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Als u een UEFI-systeem heeft, ziet dit scherm er iets anders uit. De "
 "uitvouwlijst om een opstartlader te kiezen ontbreekt, omdat er slechts één "
 "beschikbaar is."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -882,9 +970,10 @@ msgstr ""
 "\"bold\">drakboot --boot</emphasis> te typen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -893,16 +982,17 @@ msgstr ""
 "opstartstandaard enz.) te configuren."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Het bevindt zich in het Opstarten-tabblad in het Mageia-configuratiecentrum "
 "en heet \"Opstartsysteem instellen\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -911,15 +1001,16 @@ msgstr ""
 "van sommige instellingen kan verhinderen dat uw machine weer opstart!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "In het eerste deel, <guilabel>Opstartlader</guilabel>, kunt u kiezen welke "
 "<guibutton>opstartlader te gebruiken</guibutton>, GRUB, GRUB2, of LILO, en "
@@ -930,12 +1021,21 @@ msgstr ""
 "het opstarten van uw machine onmogelijk maken."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "In het tweede deel, <guilabel>Hoofdopties</guilabel>, kunt u de "
@@ -946,7 +1046,7 @@ msgstr ""
 "zodra de wachttijd verstreken is."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -955,17 +1055,17 @@ msgstr ""
 "wachwoord instellen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "De <guibutton>Geavanceerd</guibutton>knop geeft wat extra opties."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI inschakelen</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -978,12 +1078,12 @@ msgstr ""
 "als u ACPI-compatibele apparaten heeft. "
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP inschakelen</guibutton>:"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -992,7 +1092,7 @@ msgstr ""
 "multicore processors."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1001,7 +1101,7 @@ msgstr ""
 "dual processor en SMP inschakelen."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1010,7 +1110,7 @@ msgstr ""
 "inschakelen</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1030,20 +1130,34 @@ msgstr ""
 "interrupt: IRQ7\"). Schakel in dit geval APIC en/of lokale APIC uit."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Aanmeldingsnaam</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "In het <guibutton>Volgende</guibutton> scherm ziet u een lijst met alle "
 "beschikbare opties voor tijdens het opstarten. De standaard optie heeft een "
@@ -1054,13 +1168,13 @@ msgstr ""
 "toe te voegen of om een bestaande aan te passen. U dient bekend te zijn met "
 "Lilo of Grub om deze tools te kunnen gebruiken."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1070,8 +1184,8 @@ msgstr ""
 "wat u in het menu wil zien. Het komt overeen met het Grubcommando \"title\". "
 "Bijv.: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1079,8 +1193,8 @@ msgstr ""
 "Het <guilabel>Beeldbestand</guilabel>veld bevat de kernelnaam. Het komt "
 "overeen met het Grubcommando \"kernel\". Bijv. /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1088,8 +1202,9 @@ msgstr ""
 "Het <guilabel>Root</guilabel>veld bevat de apparaatnaam waar de kernel is "
 "opgeslagen. Het komt overeen met het Grubcommando \"root\". Bijv. (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1097,8 +1212,8 @@ msgstr ""
 "Het <guilabel>Toevoegen</guilabel>veld bevat de opties die bij het opstarten "
 "aan de kernel gegeven worden."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1106,102 +1221,76 @@ msgstr ""
 "Als het <guilabel>Standaard</guilabel>hokje is aangevinkt, zal Grub "
 "standaard deze ingang opstarten."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
 "file and a <guilabel>network profile</guilabel>, see <xref linkend="
 "\"draknetprofile\"/>, in the drop-down lists."
 msgstr ""
-"In het extra <guilabel>Geavanceerd</guilabel>-scherm kunt u een <guilabel>"
-"Videomodus</guilabel>, een <guilabel>initrd</guilabel>-bestand en een "
-"<guilabel>netwerkprofiel</guilabel>, zie <xref linkend=\"draknetprofile\"/>, "
-"kiezen in de uitvouwlijsten."
-
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Automatische aanmelding instellen"
+"In het extra <guilabel>Geavanceerd</guilabel>-scherm kunt u een "
+"<guilabel>Videomodus</guilabel>, een <guilabel>initrd</guilabel>-bestand en "
+"een <guilabel>netwerkprofiel</guilabel>, zie <xref linkend=\"draknetprofile"
+"\"/>, kiezen in de uitvouwlijsten."
 
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Aanmeldingsnaam</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
-"\"bold\">drakboot</emphasis> te typen."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Deze tool<placeholder type=\"footnote\" id=\"0\"/> laat één gebruiker "
-"automatisch inloggen op zijn/haar werkomgeving, zonder een wachtwoord te "
-"hoeven geven. Dat heet autologin.  Dit kan een goed idee zijn als het "
-"systeem slechts door één persoon gebruikt wordt."
+"In het extra <guilabel>Geavanceerd</guilabel>-scherm kunt u een "
+"<guilabel>Videomodus</guilabel>, een <guilabel>initrd</guilabel>-bestand en "
+"een <guilabel>netwerkprofiel</guilabel>, zie <xref linkend=\"draknetprofile"
+"\"/>, kiezen in de uitvouwlijsten."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"U vindt hem in het <emphasis role=\"bold\">Opstarten</emphasis>-tabblad van "
-"het Mageia-configuratiecentrum, het heet \"Automatische aanmelding instellen"
-"\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "De knoppen van de interface spreken voor zich:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Vink <guibutton>Open het X-Windowsysteem bij opstarten</guibutton> aan, als "
-"u wilt dat het X-Windowsysteem bij het opstarten wordt uitgevoerd. Zo niet, "
-"dan start de computer in tekstmodus. Overigens kan de grafische omgeving dan "
-"handmatig gestart worden, met het commando 'startx' of 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Als het eerste hokje is aangevinkt, zijn er nog twee opties beschikbaar. "
-"Vink <guibutton>Nee, ik wil niet automatisch aanmelden</guibutton> aan, als "
-"u een inlogscherm wilt krijgen waarin om gebruiker en wachtwoord gevraagd "
-"wordt. Kies anders <guibutton>Ja, ik wil automatisch aanmelden met deze "
-"(gebruiker, werkomgeving)</guibutton>. In dat geval dient u ook de "
-"<guilabel>Standaard gebruiker</guilabel> en <guilabel>Standaard "
-"werkomgeving</guilabel> te kiezen."
+"U kunt deze tool op de commandoregel starten, door als root <emphasis role="
+"\"bold\">drakboot</emphasis> te typen."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2555,22 +2644,22 @@ msgstr ""
 "root. We denken dat u niet meer informatie nodig heeft."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Schijfpartities beheren"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk of diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2581,7 +2670,7 @@ msgstr ""
 "te typen."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2596,7 +2685,7 @@ msgstr ""
 "<emphasis>Afsluiten</emphasis> als u niet zeker weet of u door wilt gaan."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2605,12 +2694,12 @@ msgstr ""
 "het gewenste tabblad te klikken (sda, sdb, sdc, etc)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2627,9 +2716,17 @@ msgstr ""
 "wissen, de andere knoppen worden rechts zichtbaar zodra u op een partitie "
 "klikt."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2639,12 +2736,12 @@ msgstr ""
 "Daartoe moet de partitie eerst ontkoppeld worden."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "U kunt een partitie alleen aan de rechterkant van grootte veranderen"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2657,21 +2754,22 @@ msgstr ""
 "verschijnt als een leeg deel van de schijf geselecteerd is."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "U kunt een koppelpunt maken dat niet bestaat, het zal aangemaakt worden."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Door op <emphasis><guibutton>Naar expert-modus</guibutton></emphasis> te "
@@ -2679,7 +2777,7 @@ msgstr ""
 "geven, zoals u kunt zien in de schermafbeelding hieronder."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -4136,10 +4234,10 @@ msgid ""
 "to be used to install and update packages and applications. (see Add button "
 "below)."
 msgstr ""
-"Na installatie dient u als eerste pakketbronnen (ook wel repositories, "
-"media of spiegelservers genoemd) toe te voegen. Dat betekent de bronnen "
-"kiezen die gebruikt worden om pakketten of toepassingen te installeren of "
-"bij te werken. (Zie Toevoegen-knop hieronder)."
+"Na installatie dient u als eerste pakketbronnen (ook wel repositories, media "
+"of spiegelservers genoemd) toe te voegen. Dat betekent de bronnen kiezen die "
+"gebruikt worden om pakketten of toepassingen te installeren of bij te "
+"werken. (Zie Toevoegen-knop hieronder)."
 
 #. type: Content of: <section><para><note><para>
 #: en/drakrpm-edit-media.xml:27
@@ -4513,10 +4611,10 @@ msgid ""
 msgstr ""
 "Om een hoog beveiligingsniveau te garanderen worden digitale sleutels "
 "gebruikt om de media te authenticeren. Voor elk van de media kunt u een "
-"sleutel toevoegen of verwijderen. Selecteer een medium en klik op <guibutton>"
-"Toevoegen</guibutton> om een nieuwe sleutel te gebruiken. Selecteer een "
-"sleutel die niet meer gebruikt mag worden en klik op <guibutton>Verwijderen</"
-"guibutton> om hem weg te halen."
+"sleutel toevoegen of verwijderen. Selecteer een medium en klik op "
+"<guibutton>Toevoegen</guibutton> om een nieuwe sleutel te gebruiken. "
+"Selecteer een sleutel die niet meer gebruikt mag worden en klik op "
+"<guibutton>Verwijderen</guibutton> om hem weg te halen."
 
 #. type: Content of: <section><section><para><warning><para>
 #: en/drakrpm-edit-media.xml:203
@@ -7038,13 +7136,14 @@ msgstr "Opstartstappen configureren"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -9697,11 +9796,15 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
+"Deze tool<placeholder type=\"footnote\" id=\"0\"/> bevindt zich in het "
+"Mageia-configuratiecentrum, in het <emphasis role=\"bold\">Systeem</"
+"emphasis>-tabblad, en heet \"Gebruikers op het systeem beheren\""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:27
@@ -10425,6 +10528,9 @@ msgstr ""
 "bewaren, of de nieuwe accepteren. In het laatste geval moet u uit- en in-"
 "loggen om de nieuwe te activeren."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/pt_BR.po b/docs/mcc-help/pt_BR.po
index f742c561..7b0d7a39 100644
--- a/docs/mcc-help/pt_BR.po
+++ b/docs/mcc-help/pt_BR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-07-05 02:37+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -854,7 +854,96 @@ msgstr ""
 "convida-o a fazê-lo e dar informação sobre isso."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Configurar login automático para fazer logon automaticamente no"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Você pode iniciar esta ferramenta de linha de comando, digitando <emphasis "
+"role=\"bold\">drakauth</emphasis> como root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Esta ferramenta <placeholder type=\"footnote\" id=\"0\"/> permite que você "
+"faça o login automaticamente com o mesmo usuário, em seu/seu ambiente de "
+"trabalho, sem pedir qualquer senha. É chamado login automático. Isso "
+"geralmente é uma boa idéia quando há apenas um usuário, como estar usando a "
+"máquina."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Pode ser encontrada sob a <emphasis role=\"bold\">Inicialização</emphasis> "
+"guia no Centro de Controle Mageia chamado \"Configurar login automático para "
+"fazer logon automaticamente em\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Os botões de interface são bastante óbvios:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Verifique <guibutton>Inicie o ambiente gráfico quando o sistema começa </"
+"guibutton>, se você quiser X Window System para ser executado após a "
+"inicialização. Se não, o sistema irá iniciar em modo texto. No entanto, será "
+"possível iniciar a interface gráfica manualmente. Isso pode ser feito com o "
+"lançamento do comando 'startx' ou 'systemctl começar dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Se a primeira caixa está marcada, outras duas opções estão disponíveis, "
+"verifique ou <guibutton>Não, eu não quero autologin</guibutton>, se você "
+"quiser que o sistema continue a pedir que o usuário se conectar (a senha) ou "
+"verificar <guibutton>Sim, eu quero autologin com este (usuário, desktop)</"
+"guibutton>, se necessário. Neste caso, você também precisa fornecer o nome "
+"de  <guilabel>usuário padrão</guilabel> e o <guilabel>desktop  padrão</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configure o sistema de inicialização"
 
@@ -864,23 +953,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Se você estiver usando um sistema UEFI, a interface do usuário é um pouco "
 "diferente pois você não pode escolher o carregador de inicialização do "
 "sistema (lista de sistemas instalados) uma vez que apenas um está disponível."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -894,9 +984,10 @@ msgstr ""
 "role=\"bold\">drakboot --boot</emphasis> como root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -905,16 +996,17 @@ msgstr ""
 "senha, o padrão de inicialização, etc)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Pode ser encontrada na aba Inicialização no Centro de Controle Mageia "
 "chamado \"Configurar sistema de inicialização\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -924,15 +1016,16 @@ msgstr ""
 "de novamente!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "Na primeira parte, chamada <guilabel>Bootloader</guilabel>, é possível "
 "escolher qual <guibutton>Bootloader usar</guibutton>, Grub ou Lilo, e com "
@@ -943,12 +1036,21 @@ msgstr ""
 "instalado e qualquer modificação pode impedi-lo de máquina inicializar."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "Na segunda parte, chamada <guilabel>principais opções</guilabel>, você pode "
@@ -959,7 +1061,7 @@ msgstr ""
 "uma vez que o atraso decorre."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -968,17 +1070,17 @@ msgstr ""
 "possível definir uma senha."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "O botão <guibutton>Avançado</guibutton> dá algumas opções extras."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Enable ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -991,12 +1093,12 @@ msgstr ""
 "esta caixa se o seu hardware é compatível com ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Enable SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1005,7 +1107,7 @@ msgstr ""
 "processadores multicore."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1014,7 +1116,7 @@ msgstr ""
 "processador dual e ativar o SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1023,7 +1125,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1044,20 +1146,34 @@ msgstr ""
 "Local."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>ID de Login</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Na <guibutton>Próxima</guibutton> tela, você pode ver a lista de todas as "
 "entradas disponíveis no momento da inicialização. O padrão é um asterisco. "
@@ -1068,13 +1184,13 @@ msgstr ""
 "modificar um já existente. Você precisa estar familiarizado com o LILO ou "
 "GRUB para ser capaz de usar essas ferramentas."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1084,8 +1200,8 @@ msgstr ""
 "você deseja ser exibido no menu. Ele corresponde ao Grub comando \"título "
 "\". Por exemplo: Mageia 3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1093,8 +1209,8 @@ msgstr ""
 "O campo <guilabel>Imagem</guilabel> contém o nome do kernel. Ele corresponde "
 "ao Grub comando \"do kernel\". Por exemplo /boot /vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1103,8 +1219,9 @@ msgstr ""
 "está armazenado. Ele corresponde ao Grub comando \"root\". Por exemplo, "
 "(hd0, 1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1112,8 +1229,8 @@ msgstr ""
 "O <guilabel>Anexo</guilabel> contém as opções a serem dadas para o kernel no "
 "momento da inicialização."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1121,8 +1238,8 @@ msgstr ""
 "Se a caixa <guilabel>Padrão</guilabel> estiver marcada, o Grub irá "
 "inicializar esta entrada por padrão."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1134,91 +1251,63 @@ msgstr ""
 "<guilabel>perfil da rede</guilabel >, veja <xref linkend=\"draknetprofile\"/"
 ">, nas listas drop-down."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Configurar login automático para fazer logon automaticamente no"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>ID de Login</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Você pode iniciar esta ferramenta de linha de comando, digitando <emphasis "
-"role=\"bold\">drakboot</emphasis> como root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Esta ferramenta <placeholder type=\"footnote\" id=\"0\"/> permite que você "
-"faça o login automaticamente com o mesmo usuário, em seu/seu ambiente de "
-"trabalho, sem pedir qualquer senha. É chamado login automático. Isso "
-"geralmente é uma boa idéia quando há apenas um usuário, como estar usando a "
-"máquina."
+"Na tela extra chamado de <guilabel>Avançado</guilabel>, é possível escolher "
+"o modo <guilabel>Vídeo</guilabel>, um arquivo<guilabel>initrd</guilabel> e "
+"<guilabel>perfil da rede</guilabel >, veja <xref linkend=\"draknetprofile\"/"
+">, nas listas drop-down."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Pode ser encontrada sob a <emphasis role=\"bold\">Inicialização</emphasis> "
-"guia no Centro de Controle Mageia chamado \"Configurar login automático para "
-"fazer logon automaticamente em\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Os botões de interface são bastante óbvios:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Verifique <guibutton>Inicie o ambiente gráfico quando o sistema começa </"
-"guibutton>, se você quiser X Window System para ser executado após a "
-"inicialização. Se não, o sistema irá iniciar em modo texto. No entanto, será "
-"possível iniciar a interface gráfica manualmente. Isso pode ser feito com o "
-"lançamento do comando 'startx' ou 'systemctl começar dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Se a primeira caixa está marcada, outras duas opções estão disponíveis, "
-"verifique ou <guibutton>Não, eu não quero autologin</guibutton>, se você "
-"quiser que o sistema continue a pedir que o usuário se conectar (a senha) ou "
-"verificar <guibutton>Sim, eu quero autologin com este (usuário, desktop)</"
-"guibutton>, se necessário. Neste caso, você também precisa fornecer o nome "
-"de  <guilabel>usuário padrão</guilabel> e o <guilabel>desktop  padrão</"
-"guilabel>."
+"Você pode iniciar esta ferramenta de linha de comando, digitando <emphasis "
+"role=\"bold\">drakboot</emphasis> como root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2639,22 +2728,22 @@ msgstr ""
 "mais informações sobre isso."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gerenciar partições de disco"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk ou diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2665,7 +2754,7 @@ msgstr ""
 "emphasis> como root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2681,7 +2770,7 @@ msgstr ""
 "continuar."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2691,12 +2780,12 @@ msgstr ""
 "sdc, etc.)"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2713,9 +2802,17 @@ msgstr ""
 "apagar o disco completo, os outros botões tornam-se visíveis à direita "
 "depois que você clica em uma partição."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2725,12 +2822,12 @@ msgstr ""
 "a partição deve ser desmontado primeiro."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Só é possível redimensionar uma partição no seu lado direito"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2743,20 +2840,21 @@ msgstr ""
 "vazio é selecionado"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Você pode escolher um ponto que não existe montagem, ele será criado."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Selecionando <emphasis><guibutton> Alternar para o modo expert </guibutton></"
@@ -2764,7 +2862,7 @@ msgstr ""
 "pode ser visto na imagem abaixo."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7647,13 +7745,14 @@ msgstr "Configure etapas de inicialização"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10587,10 +10686,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Esta ferramenta <placeholder type=\"footnote\" id=\"0\"/> é encontrado sob a "
 "<emphasis role=\"bold\">Sistema</emphasis> guia no Centro de Controle Mageia "
@@ -11388,3 +11488,6 @@ msgstr ""
 "para confirmar. Ainda há tempo para cancelar tudo e manter a configuração "
 "anterior, ou para aceitar. Neste caso, você tem que desconectar e reconectar "
 "para ativar a nova configuração."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/ro.po b/docs/mcc-help/ro.po
index 3d0ddadc..a970852a 100644
--- a/docs/mcc-help/ro.po
+++ b/docs/mcc-help/ro.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-29 14:21+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -850,7 +850,95 @@ msgstr ""
 "invită s-o faceți și vă oferă informațiile necesare în această privință."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Configurați autentificarea automată"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Puteți lansa această unealtă din linia de comandă, tastînd <emphasis role="
+"\"bold\">drakauth</emphasis> ca root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Această unealtă<placeholder type=\"footnote\" id=\"0\"/> vă permite să "
+"autentificați în mod automat același utilizator, în mediul său de birou, "
+"fără să se ceară vreo parolă. Se numește autentificare automată. Acest lucru "
+"poate fi în general o idee bună dacă mașina este folosită de un singur "
+"utilizator."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Se găsește în categoria <emphasis role=\"bold\">Demaraj</emphasis> din "
+"Centrul de Control Mageia intitulat „Configurați autentificarea automată”."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Butoanele interfeței sînt destul de evidente:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Bifați <guibutton>Lansează interfața grafică la demararea sistemului</"
+"guibutton> dacă doriți ca X Windows System să fie executat imediat după "
+"demarare. Altfel, sistemul va porni în mod text. În acest caz interfața "
+"grafică va putea fi lansată manual. Acest lucru se poate face tastînd în "
+"linie de comandă „startx”' sau „systemctl start dm”."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Dacă bifați prima căsuță, alte două opțiuni vor fi disponibile. Apoi alegeți "
+"<guibutton>Nu, nu vreau autentificare automată</guibutton> dacă doriți ca "
+"sistemul să ceară un utilizator (și parolă) pentru conectare, sau "
+"<guibutton>Da, vreau autentificare automată cu acest (utilizator, birou)</"
+"guibutton> dacă asta doriți. În acest caz va trebui să furnizați "
+"<guilabel>Utilizatorul implicit</guilabel> și <guilabel>Biroul implicit</"
+"guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Configurați demarajul sistemului"
 
@@ -860,23 +948,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Dacă utilizați un sistem UEFI, interfața utilizator este un pic diferită "
 "deoarece nu puteți alege încărcătorul de sistem (prima listă derulantă) din "
 "moment ce numai unul singur este disponibil."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -890,9 +979,10 @@ msgstr ""
 "\"bold\">drakboot --boot</emphasis> ca root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -901,16 +991,17 @@ msgstr ""
 "definirea unei parole, opțiunea de pornire implicită, etc.)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Se găsește în categoria demaraj din Centrul de Control Mageia intitulat "
 "„Configurați demarajul sistemului”."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -920,15 +1011,16 @@ msgstr ""
 "viitoare!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "În prima parte, numită <guilabel>Încărcător de sistem</guilabel>, puteți "
 "alege între GRUB sau LILO ca <guibutton>Încărcător de sistem utilizat</"
@@ -939,12 +1031,21 @@ msgstr ""
 "de demaraj și orice modificare poate împiedica demararea sistemului."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "În a doua parte, intitulată <guilabel>Opțiuni principale</guilabel>, puteți "
@@ -955,7 +1056,7 @@ msgstr ""
 "cînd s-a scurs timpul de așteptare."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -964,18 +1065,18 @@ msgstr ""
 "este posibil să definiți o parolă."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "Butonul <guibutton>Avansat</guibutton> vă oferă cîteva opțiuni suplimentare."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Activează ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -988,12 +1089,12 @@ msgstr ""
 "căsuță dacă aveți componente compatibile ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Activează SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1002,7 +1103,7 @@ msgstr ""
 "procesoarele cu mai multe nuclee."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1011,7 +1112,7 @@ msgstr ""
 "procesor și va activa SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1020,7 +1121,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1041,20 +1142,34 @@ msgstr ""
 "acest caz dezactivați APIC și/sau APIC local."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Identificator de conexiune</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "În ecranul următor veți putea vedea lista tuturor intrărilor disponibile la "
 "demaraj. Cea implicită are un asterisc. Pentru a schimba ordinea intrărilor "
@@ -1064,13 +1179,13 @@ msgstr ""
 "modifica sau adăuga o nouă intrare în meniul GRUB. Trebuie să fiți "
 "familiarizat cu LILO sau GRUB pentru a putea utiliza aceste unelte."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1080,8 +1195,8 @@ msgstr ""
 "să fie afișat în meniu. Acesta corespunse comenzii GRUB „title”. De exemplu: "
 "Mageia 4."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1089,8 +1204,8 @@ msgstr ""
 "Cîmpul <guilabel>Imagine</guilabel> conține numele nucleului. Corespunde "
 "comenzii GRUB „kernel”. De exemplu: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1098,8 +1213,9 @@ msgstr ""
 "Cîmpul <guilabel>Root</guilabel> conține numele dispozitivului unde de află "
 "nucleul. Corespunde comenzi GRUB „root”. De exemplu: (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1107,8 +1223,8 @@ msgstr ""
 "Cîmpul <guilabel>Opțiuni aplicate nucleului</guilabel> conține opțiuni "
 "aplicate nucleului la demaraj."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1116,8 +1232,8 @@ msgstr ""
 "Dacă este bifată căsuța <guilabel>Implicit</guilabel>, GRUB va demara "
 "această intrare în mod implicit."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1129,90 +1245,63 @@ msgstr ""
 "un <guilabel>profil de rețea</guilabel>, vedeți <xref linkend="
 "\"draknetprofile\"/> în listele derulante."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Configurați autentificarea automată"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Identificator de conexiune</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Puteți lansa această unealtă din linia de comandă, tastînd <emphasis role="
-"\"bold\">drakboot</emphasis> ca root."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Această unealtă<placeholder type=\"footnote\" id=\"0\"/> vă permite să "
-"autentificați în mod automat același utilizator, în mediul său de birou, "
-"fără să se ceară vreo parolă. Se numește autentificare automată. Acest lucru "
-"poate fi în general o idee bună dacă mașina este folosită de un singur "
-"utilizator."
+"În ecranul suplimentar intitulat <guilabel>Avansat</guilabel>, puteți alege "
+"<guilabel>Modul video</guilabel>, un fișier <guilabel>initrd</guilabel> și "
+"un <guilabel>profil de rețea</guilabel>, vedeți <xref linkend="
+"\"draknetprofile\"/> în listele derulante."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Se găsește în categoria <emphasis role=\"bold\">Demaraj</emphasis> din "
-"Centrul de Control Mageia intitulat „Configurați autentificarea automată”."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Butoanele interfeței sînt destul de evidente:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Bifați <guibutton>Lansează interfața grafică la demararea sistemului</"
-"guibutton> dacă doriți ca X Windows System să fie executat imediat după "
-"demarare. Altfel, sistemul va porni în mod text. În acest caz interfața "
-"grafică va putea fi lansată manual. Acest lucru se poate face tastînd în "
-"linie de comandă „startx”' sau „systemctl start dm”."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Dacă bifați prima căsuță, alte două opțiuni vor fi disponibile. Apoi alegeți "
-"<guibutton>Nu, nu vreau autentificare automată</guibutton> dacă doriți ca "
-"sistemul să ceară un utilizator (și parolă) pentru conectare, sau "
-"<guibutton>Da, vreau autentificare automată cu acest (utilizator, birou)</"
-"guibutton> dacă asta doriți. În acest caz va trebui să furnizați "
-"<guilabel>Utilizatorul implicit</guilabel> și <guilabel>Biroul implicit</"
-"guilabel>."
+"Puteți lansa această unealtă din linia de comandă, tastînd <emphasis role="
+"\"bold\">drakboot</emphasis> ca root."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2631,22 +2720,22 @@ msgstr ""
 "trebuie mai multe informații despre asta."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Gestionați partițiile"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk sau diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2657,7 +2746,7 @@ msgstr ""
 "emphasis> ca root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2673,7 +2762,7 @@ msgstr ""
 "să continuați."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2682,12 +2771,12 @@ msgstr ""
 "lucrați selectînd secțiunea corespunzătoare (sda, sdb, sdc etc)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2704,9 +2793,17 @@ msgstr ""
 "de mai jos este pentru ștergerea completă a discului, celelalte butoane "
 "devin vizibile pe partea dreaptă după ce faceți clic pe o partiție."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2716,12 +2813,12 @@ msgstr ""
 "operațiuni trebuie mai întîi s-o demontați."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "O partiție se poate redimensiona numai de partea sa dreaptă."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2734,20 +2831,21 @@ msgstr ""
 "discului."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Puteți alege un punct de montare care nu există, acesta va fi creat."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Selectînd <emphasis><guibutton>Comută în regim expert</guibutton></emphasis> "
@@ -2755,7 +2853,7 @@ msgstr ""
 "cum se poate vedea în captura de ecran de mai jos."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7658,13 +7756,14 @@ msgstr "Configurați demarajul sistemului"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10597,10 +10696,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Această unealtă<placeholder type=\"footnote\" id=\"0\"/> se găsește în "
 "categoria <emphasis role=\"bold\">Sistem</emphasis> din Centrul de Control "
@@ -11406,3 +11506,6 @@ msgstr ""
 "cere să confirmați. Încă se mai poate anula totul și păstra configurația "
 "precedentă, sau să acceptați. În acest caz, va trebui să vă deconectați și "
 "reconectați pentru a activa noua configurație."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/ru.po b/docs/mcc-help/ru.po
index 08a4f9b1..0675019e 100644
--- a/docs/mcc-help/ru.po
+++ b/docs/mcc-help/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-23 08:40+0000\n"
 "Last-Translator: Valentin XliN Saikov <saikov.vb@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
@@ -881,7 +881,98 @@ msgstr ""
 "быть предоставлены администратором сети."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Настройка автовхода"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakauth</emphasis> от имени администратора (root)."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно "
+"приказать системе загружаться в аккаунт того же пользователя и в той же "
+"рабочей среде без необходимости ввода пароля. Такая возможность называется "
+"автовход. Как правило, такой способ загрузки является удобным, если "
+"компьютером будет пользоваться только один пользователь."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Доступ к этой программе можно получить с помощью пункта <emphasis role=\"bold"
+"\">«Загрузка»</emphasis> из Центра управления Mageia. Раздел «Настройка "
+"автовхода»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Назначение кнопок интерфейса является достаточно очевидным:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Отметьте пункт <guibutton>Запускать графическую оболочку при загрузке</"
+"guibutton>, если вы хотите запускать систему X Window во время загрузки. "
+"Если параметр отмечен не будет, система запустится в текстовом режиме. "
+"Впрочем, графический интерфейс можно будет запустить из текстового режима "
+"вручную. Сделать это можно с помощью команды 'startx' или 'systemctl start "
+"dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Если установлен первый пункт, вы получите доступ к двум другим пунктам. Вы "
+"можете выбрать пункт <guibutton>Нет, я не хочу использовать автоматический "
+"вход</guibutton>, если вы хотите, чтобы система продолжала спрашивать вас о "
+"том, под какой из учётных записей пользователей следует войти и будет "
+"просить ввести пароль. Другим вариантом является обозначение пункта "
+"<guibutton>Да, я хочу осуществлять автовход под этим (пользователем, рабочим "
+"столом)</guibutton>, в этом случае вам следует указать значения параметров "
+"<guilabel>Пользователь</guilabel> и <guilabel>Рабочий стол</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Настройка способа загрузки системы"
 
@@ -891,23 +982,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Если вы пользуетесь системой с UEFI system, интерфейс немного отличаться, "
 "поскольку вы не сможете выбрать загрузчик (с первого раскрывающегося "
 "списка), - здесь выбор будет однозначным."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -922,9 +1014,10 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -933,16 +1026,17 @@ msgstr ""
 "пароль, определить вариант загрузки по умолчанию и др.)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Доступ к этой программе можно получить с помощью пункта «Загрузка» из Центра "
 "управления Mageia. Раздел «Настройка загрузки»."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -952,15 +1046,16 @@ msgstr ""
 "помешать штатной загрузке вашей системы!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "С помощью первой части с названием <guilabel>Загрузчик</guilabel> можно "
 "выбрать загрузчик, который следует использовать Grub или Lilo, и определить "
@@ -972,12 +1067,21 @@ msgstr ""
 "загрузчик, любые изменения могут помешать загрузке системы."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "С помощью второй части, <guilabel>Основные параметры</guilabel>, вы можете "
@@ -988,7 +1092,7 @@ msgstr ""
 "умолчанию."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -997,19 +1101,19 @@ msgstr ""
 "<guibutton>Безопасность</guibutton>, можно установить пароль для загрузчика."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "С помощью кнопки <guibutton>Дополнительно</guibutton> можно получить доступ "
 "к дополнительным параметрам."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Включить ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1023,12 +1127,12 @@ msgstr ""
 "этот пункт, если ваше оборудование является совместимым с ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Включить SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1037,7 +1141,7 @@ msgstr ""
 "многопроцессорный), так называется архитектура многопроцессорных систем."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1046,7 +1150,7 @@ msgstr ""
 "HyperThreading, Mageia определит его как двойной процессор и включит SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1055,7 +1159,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1078,20 +1182,34 @@ msgstr ""
 "или локальный APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Логин пользователя</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "После нажатия кнопки <guibutton>Далее</guibutton> вы увидите список всех "
 "доступных пунктов меню загрузки. Пункт по умолчанию помечен звёздочкой. "
@@ -1103,13 +1221,13 @@ msgstr ""
 "используйте эти кнопки, если вы не знакомы с синтаксисом команд Lilo или "
 "Grub."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1119,8 +1237,8 @@ msgstr ""
 "можете вписать что угодно, что хотите видеть в меню. Этот пункт "
 "соответствует команде Grub «title». Пример: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1128,8 +1246,8 @@ msgstr ""
 "В поле <guilabel>Образ</guilabel> должно быть указано название ядра. Этот "
 "пункт соответствует команде Grub «kernel». Пример: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1138,8 +1256,9 @@ msgstr ""
 "на котором хранится ядро. Этот пункт соответствует команде Grub «root». "
 "Пример: (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1147,8 +1266,8 @@ msgstr ""
 "В поле <guilabel>Добавить</guilabel> должны быть указаны параметры, которые "
 "передаются ядру во время загрузки."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1156,8 +1275,8 @@ msgstr ""
 "Если будет выбрана опция <guilabel>По умолчанию</guilabel>, Grub загружает "
 "соответствующую систему по умолчанию."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1169,93 +1288,63 @@ msgstr ""
 "<guilabel>initrd</guilabel> и <guilabel>Сетевой профиль</guilabel> см. <xref "
 "linkend=\"draknetprofile\"/>, из выпадающего списка."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Настройка автовхода"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Логин пользователя</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
-"<emphasis role=\"bold\">drakboot</emphasis> от имени администратора (root)."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"С помощью этой программы<placeholder type=\"footnote\" id=\"0\"/> можно "
-"приказать системе загружаться в аккаунт того же пользователя и в той же "
-"рабочей среде без необходимости ввода пароля. Такая возможность называется "
-"автовход. Как правило, такой способ загрузки является удобным, если "
-"компьютером будет пользоваться только один пользователь."
+"С помощью дополнительного окна, открыть которое можно нажатием кнопки "
+"<guilabel>Дополнительно</guilabel>, <guilabel>Режим видео</guilabel>, "
+"<guilabel>initrd</guilabel> и <guilabel>Сетевой профиль</guilabel> см. <xref "
+"linkend=\"draknetprofile\"/>, из выпадающего списка."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Доступ к этой программе можно получить с помощью пункта <emphasis role=\"bold"
-"\">«Загрузка»</emphasis> из Центра управления Mageia. Раздел «Настройка "
-"автовхода»."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Назначение кнопок интерфейса является достаточно очевидным:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Отметьте пункт <guibutton>Запускать графическую оболочку при загрузке</"
-"guibutton>, если вы хотите запускать систему X Window во время загрузки. "
-"Если параметр отмечен не будет, система запустится в текстовом режиме. "
-"Впрочем, графический интерфейс можно будет запустить из текстового режима "
-"вручную. Сделать это можно с помощью команды 'startx' или 'systemctl start "
-"dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Если установлен первый пункт, вы получите доступ к двум другим пунктам. Вы "
-"можете выбрать пункт <guibutton>Нет, я не хочу использовать автоматический "
-"вход</guibutton>, если вы хотите, чтобы система продолжала спрашивать вас о "
-"том, под какой из учётных записей пользователей следует войти и будет "
-"просить ввести пароль. Другим вариантом является обозначение пункта "
-"<guibutton>Да, я хочу осуществлять автовход под этим (пользователем, рабочим "
-"столом)</guibutton>, в этом случае вам следует указать значения параметров "
-"<guilabel>Пользователь</guilabel> и <guilabel>Рабочий стол</guilabel>."
+"Запустить эту программу можно с помощью терминала: достаточно ввести команду "
+"<emphasis role=\"bold\">drakboot</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2711,22 +2800,22 @@ msgstr ""
 "идет речь."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Управление разделами диска"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk або diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2737,7 +2826,7 @@ msgstr ""
 "\">diskdrake</emphasis> от имени администратора (root)."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2753,7 +2842,7 @@ msgstr ""
 "с программой."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2763,12 +2852,12 @@ msgstr ""
 "д.)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2786,9 +2875,17 @@ msgstr ""
 "предназначена для стирания всего диска. Доступ к другим кнопкам действий, "
 "расположенных справа, можно получить после нажатия на картинке раздела диска."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2799,14 +2896,14 @@ msgstr ""
 "вам следует сначала размонтировать раздел."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Изменение размеров раздела можно выполнять только за счет правой границы "
 "раздела."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2819,22 +2916,23 @@ msgstr ""
 "\">Создать</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Вы можете выбрать точку монтирования, которой не существует. Если будет "
 "осуществлен такой выбор, соответствующая точка монтирования будет создана."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Нажатие кнопки <emphasis><guibutton>Переключить в режим эксперта</"
@@ -2843,7 +2941,7 @@ msgstr ""
 "снимке."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7846,13 +7944,14 @@ msgstr "Настройка последовательности загрузки
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10850,10 +10949,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Доступ к этому инструменту<placeholder type=\"footnote\" id=\"0\"/> можно "
 "получить с помощью пункта <emphasis role=\"bold\">Система</emphasis> из "
@@ -11690,3 +11790,6 @@ msgstr ""
 "предыдущие настройки или подтвердить их внесения. Если изменения будут "
 "подтверждены, вам придется выйти из учетной записи и снова войти в него, "
 "чтобы задействовать внесены изменения."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/sv.po b/docs/mcc-help/sv.po
index 00935d50..3732a45c 100644
--- a/docs/mcc-help/sv.po
+++ b/docs/mcc-help/sv.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-23 10:30+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
@@ -833,7 +833,94 @@ msgstr ""
 "göra det och ger dig information om det."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Konfigurera autologin för automatisk inloggning"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Du kan starta det här verktyget från kommandoraden genom att skriva "
+"<emphasis role=\"bold\">drakauth</emphasis> som root."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Med detta verktyg<placeholder type=\"footnote\" id=\"0\"/> kan du ställa in "
+"automatisk inloggning för en användare utan att ange lösenord. Det kallas "
+"automatisk inloggning och kan vara användbart när det bara finns en "
+"användare som använder datorn."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Det finns under <emphasis role=\"bold\">Start</emphasis>-fliken i Mageias "
+"kontrollcenter och är märkt \"Ställ in automatisk inloggning\"."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Gränssnittets knappar är ganska uppenbara:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Kryssa i <guibutton>Starta det grafiska gränssnittet automatiskt när datorn "
+"startar</guibutton> om du vill att X-fönstersystem ska startas efter "
+"uppstarten. Annars kommer systemet att starta i textbaserad läge. Oavsett "
+"vad så är det möjligt att starta det grafiska gränssnittet manuellt, genom "
+"att t. ex. att köra kommandot 'startx' eller 'systemctl start dm'."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Om första rutan är ikryssad kommer två nya alternativ att vara tillgängliga, "
+"antingen väljer du <guibutton>Nej, jag vill inte använda autologin</"
+"guibutton> om du vill att systemet ska fortsätta att fråga om användarnamn "
+"och lösenord, eller kryssa i <guibutton>Ja, jag vill använda autologin för "
+"denna (användare, skrivbord)</guibutton> om nödvändigt. I så fall måste du "
+"även ange <guilabel>standardanvändare</guilabel> och <guilabel>standard "
+"skrivbordsmiljö</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Ställ in uppstartssystemet"
 
@@ -843,23 +930,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Om du använder ett UEFI-system så är gränssnittet något annorlunda eftersom "
 "du inte kan välja starthanterare (första rullgardinsmenyn), det finns bara "
 "en tillgänglig."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -873,9 +961,10 @@ msgstr ""
 "<emphasis role=\"bold\">drakboot --boot</emphasis> som root."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -884,16 +973,17 @@ msgstr ""
 "lösenord, standard-uppstarten etc.)"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Det hittas under fliken Uppstart i Mageia's Kontrollcentral märkt \"Ställ in "
 "uppstartssystemet\"."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -902,15 +992,16 @@ msgstr ""
 "ändra några inställningar kan förhindra att din maskin startar upp igen !"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "I den första delen kallad <guilabel>Starthanterare</guilabel> kan man välja "
 "vilken starthanterare som ska användas, antingen Grub eller Lilo och med "
@@ -921,12 +1012,21 @@ msgstr ""
 "att starta."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "I andra delen kallad <guilabel>Huvudinställningar</guilabel> kan du ställa "
@@ -937,7 +1037,7 @@ msgstr ""
 "ut."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -946,17 +1046,17 @@ msgstr ""
 "det möjligt att ställa in ett lösenord."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "Knappen <guibutton>Avancerat</guibutton> ger några extra val."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Aktivera ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -969,12 +1069,12 @@ msgstr ""
 "är ACPI-kompatibel."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Aktivera SMP:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -983,7 +1083,7 @@ msgstr ""
 "processorer med flera kärnor."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -992,7 +1092,7 @@ msgstr ""
 "dubbelkärnig processor och aktivera SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1001,7 +1101,7 @@ msgstr ""
 "guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1022,20 +1122,34 @@ msgstr ""
 "eller lokal APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Inloggnings-ID</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "På <guibutton>Nästa</guibutton> skärm visas alla tillgängliga poster som "
 "finns vid uppstart. Standard är markerad med en asterisk. Klicka på upp "
@@ -1045,13 +1159,13 @@ msgstr ""
 "nya poster i Grubmenyn eller ändra befintliga. Du bör känna till hur Lilo "
 "eller Grub fungerar för att använda dessa verktyg."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1060,8 +1174,8 @@ msgstr ""
 "<guilabel>Etikettfältet</guilabel> är valfritt, ange vad som ska visas i "
 "menyn. Det matchar Grubs titel-kommando. T. ex: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1069,8 +1183,8 @@ msgstr ""
 "Fältet <guilabel>Avbild</guilabel> innehåller namnet på kärnan. Det matchar "
 "Grub-kommandot \"kernel\". Till exempel /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1078,8 +1192,9 @@ msgstr ""
 "Fältet <guilabel>Root</guilabel> innehåller enhetsnamnet där kärnan lagras. "
 "Det matchar Grub-kommandot \"root\". Till exempel (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1087,8 +1202,8 @@ msgstr ""
 "Fältet <guilabel>Bifoga</guilabel> innehåller valen som ska anges till "
 "kärnan vid tid för uppstart."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1096,8 +1211,8 @@ msgstr ""
 "Om rutan <guilabel>Standard</guilabel> är förvalt så kommer Grub att ladda "
 "den här posten som standard."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1109,87 +1224,61 @@ msgstr ""
 "<guilabel>nätverksprofil</guilabel>. Titta i <xref linkend=\"draknetprofile"
 "\"/> i rullgardinsmenyerna."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Konfigurera autologin för automatisk inloggning"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Inloggnings-ID</emphasis>"
 
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
+msgid ""
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
+msgstr ""
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
 msgstr "drakboot.png"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
-msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
-msgstr "Du kan starta det här verktyget från "
-
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Med detta verktyg<placeholder type=\"footnote\" id=\"0\"/> kan du ställa in "
-"automatisk inloggning för en användare utan att ange lösenord. Det kallas "
-"automatisk inloggning och kan vara användbart när det bara finns en "
-"användare som använder datorn."
+"I rutan för <guilabel>Avancerat</guilabel> är det möjligt att välja "
+"<guilabel>videoläge</guilabel>, en <guilabel>initrd</guilabel>-fil och en "
+"<guilabel>nätverksprofil</guilabel>. Titta i <xref linkend=\"draknetprofile"
+"\"/> i rullgardinsmenyerna."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Det finns under <emphasis role=\"bold\">Start</emphasis>-fliken i Mageias "
-"kontrollcenter och är märkt \"Ställ in automatisk inloggning\"."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Gränssnittets knappar är ganska uppenbara:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Kryssa i <guibutton>Starta det grafiska gränssnittet automatiskt när datorn "
-"startar</guibutton> om du vill att X-fönstersystem ska startas efter "
-"uppstarten. Annars kommer systemet att starta i textbaserad läge. Oavsett "
-"vad så är det möjligt att starta det grafiska gränssnittet manuellt, genom "
-"att t. ex. att köra kommandot 'startx' eller 'systemctl start dm'."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
-msgstr ""
-"Om första rutan är ikryssad kommer två nya alternativ att vara tillgängliga, "
-"antingen väljer du <guibutton>Nej, jag vill inte använda autologin</"
-"guibutton> om du vill att systemet ska fortsätta att fråga om användarnamn "
-"och lösenord, eller kryssa i <guibutton>Ja, jag vill använda autologin för "
-"denna (användare, skrivbord)</guibutton> om nödvändigt. I så fall måste du "
-"även ange <guilabel>standardanvändare</guilabel> och <guilabel>standard "
-"skrivbordsmiljö</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
+msgstr "Du kan starta det här verktyget från "
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2591,22 +2680,22 @@ msgstr ""
 "inte du behöver mer information än så."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Hantera hårddisk-partitioner"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk eller diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2617,7 +2706,7 @@ msgstr ""
 "emphasis> som root."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2632,7 +2721,7 @@ msgstr ""
 "emphasis> om du är osäker på om du vill fortsätta."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2641,12 +2730,12 @@ msgstr ""
 "jobba på genom att välja den korrekta fliken (sda, sdb, sdc osv)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2662,9 +2751,17 @@ msgstr ""
 "längst ner används för att radera hela disken, de andra knapparna blir "
 "synliga och visas till höger när du klickat på en partition."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2674,12 +2771,12 @@ msgstr ""
 "det så måste partitionen avmonteras först."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Det är endast möjligt att skala partitionen på dess högra sida."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2692,22 +2789,23 @@ msgstr ""
 "oanvänt diskutrymme."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Du kan välja en monteringspunkt som inte existerar, den kommer då att bli "
 "skapad."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Att välja <emphasis><guibutton>Byt till expertläge</guibutton></emphasis> "
@@ -2715,7 +2813,7 @@ msgstr ""
 "i skärmdumpen nedan."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7537,13 +7635,14 @@ msgstr "Konfigurera start-steg"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10427,10 +10526,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Det här verktyget<placeholder type=\"footnote\" id=\"0\"/> finns under "
 "fliken <emphasis role=\"bold\">System</emphasis> i Mageias kontrollcentral "
@@ -11224,3 +11324,6 @@ msgstr ""
 "bekräfta ändringarna. Du kan fortfaranade avbryta och behålla de tidigare "
 "inställningarna, eller acceptera. I det här fallet måste du koppla ner och "
 "sedan koppla upp igen för att den nya konfigurationen ska gälla."
+
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
diff --git a/docs/mcc-help/tr.po b/docs/mcc-help/tr.po
index c17c8d74..54438193 100644
--- a/docs/mcc-help/tr.po
+++ b/docs/mcc-help/tr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-25 01:22+0300\n"
 "Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
 "Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
@@ -839,7 +839,94 @@ msgstr ""
 "değiştirin ve hakkında ona bilgi verin."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Otomatik oturum açmayı ayarlayın"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakauth</"
+"emphasis> yazarak çalıştırabilirsiniz."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"Bu aygıt<placeholder type=\"footnote\" id=\"0\"/>parola sormadan aynı "
+"kullanıcının kendi masaüstü ortamına kendiliğinden giriş yapmasını sağlar. "
+"Otomatik giriş olarak adlandırılır.   Makineyi kullanacak tek bir kullanıcı "
+"varsa bu genellikle iyi bir fikirdir."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Mageia Denetim Merkezinde <emphasis role=\"bold\">Önyükleme</emphasis> "
+"sekmesi altında \"Otomatik oturum açmayı ayarlayın\" etiketi altında bulunur."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Arayüz düğmeleri oldukça açıktır:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Eğer X Window System önyükleme sonrası çalıştırılacaksa <guibutton>Grafiksel "
+"ortam açılışta çalıştırılsın</guibutton> kutusunu işaretleyin. Aksi durumda "
+"sistem metin kipinde başlatılacaktır. Yine de grafik arayüzü elle başlatmak "
+"mümkün olacaktır. Bu ise 'startx' veya 'systemctl start dm' komutunu "
+"çalıştırarak yapılabilir."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Eğer ilk kutu işaretlenmiş ise, diğer iki seçeneğe erişilebilir, eğer "
+"sistemin hangi kullanıcının oturum açacağını (ve parola) sormaya devam "
+"etmesini istiyorsanız <guibutton>Hayır, otomatik oturum açma istemiyorum</"
+"guibutton> ya da  gerekliyse <guibutton>Evet, şununla (kullanıcı, masaüstü) "
+"otomatik oturum açmak istiyorum</guibutton> işaretleyin. Bu durumda ayrıca  "
+"<guilabel>Varsayılan kullanıcı adı</guilabel>nı ve <guilabel>Varsayılan "
+"masaüstü</guilabel>nü girmeniz gerekir. "
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Önyükleme sistemini ayarlayın"
 
@@ -849,22 +936,23 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Bir UEFI sistem kullanıyorsanız kullanıcı arayüzü biraz farklıdır çünkü "
 "sadece bir tane mevcut olduğundan önyükleyici (ilk açılır menü) seçemezsiniz."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -878,9 +966,10 @@ msgstr ""
 "emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -889,16 +978,17 @@ msgstr ""
 "ayarlamanızı sağlar"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Mageia Denetim Merkezi' ndeki Önyükleme sekmesinde \"Önyükleme sistemini "
 "ayarlayın\" etiketi altında bulunur."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -907,15 +997,16 @@ msgstr ""
 "ayarlarını değiştirerek makinenizin tekrar başlamasına engel olabilir!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "<guilabel>Önyükleyici</guilabel> denilen ilk bölümde, hangi "
 "<guibutton>Önyükleyicinin kullanılacağı</guibutton>nı, Grub veya Lilo ve "
@@ -927,12 +1018,21 @@ msgstr ""
 "yapmasını engelleyebileceğini unutmayın."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "<guilabel>Ana seçenekler</guilabel> olarak adlandırılan ikinci bölümde, "
@@ -943,7 +1043,7 @@ msgstr ""
 "tanımlı olanı yükleyecektir."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -952,17 +1052,17 @@ msgstr ""
 "ayarlamak mümkündür."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr "<guibutton>Gelişmiş</guibutton> düğmesi ise bazı ek seçenekler sunar."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>ACPI özelliğini etkinleştir:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -975,12 +1075,12 @@ msgstr ""
 "seçeneği işaretleyin."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>SMP özelliğini etkinleştir:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -989,7 +1089,7 @@ msgstr ""
 "işlemciler için bir mimaridir."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -998,7 +1098,7 @@ msgstr ""
 "olarak algılayacak ve SMP etkinleştirilecektir."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1008,7 +1108,7 @@ msgstr ""
 "Boot sekmesi altında bulunur."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1029,20 +1129,34 @@ msgstr ""
 "bırakılmalıdır."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Oturum ID</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "<guibutton>İleri</guibutton> ekranında, önyükleme sırasında kullanılabilir "
 "durumdaki tüm girdilerin bir listesini görebilirsiniz. Öntanımlı olan yıldız "
@@ -1053,13 +1167,13 @@ msgstr ""
 "pencere açılacaktır. Bu araçları kullanabilmek için Lilo veya Grub' a aşina "
 "olmanız gerekir. "
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1069,8 +1183,8 @@ msgstr ""
 "görüntülenmesini istediğiniz şekilde yazın. Grub komutlarından \"title\" ile "
 "aynıdır. Örneğin: Mageia3"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1078,8 +1192,8 @@ msgstr ""
 "<guilabel>Görüntü</guilabel> alanı çekirdek adını içerir. Grub komutu "
 "\"kernel\" ile eşleşmektedir. Örneğin /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1087,8 +1201,9 @@ msgstr ""
 "<guilabel>Kök</guilabel> alanı çekirdeğin depolandığı aygıt adını içerir. "
 "Grub komutu \"root\" ile eşleşmektedir. Örneğin (hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1096,8 +1211,8 @@ msgstr ""
 "<guilabel>Sonuna ekle</guilabel> alanı çekirdeğe önyükleme anında verilen "
 "seçenekleri içerir."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1105,8 +1220,8 @@ msgstr ""
 "<guilabel>Öntanımlı</guilabel> kutucuğu işaretliyse, Grub öntanımlı olarak "
 "bu girdi ile önyükleme yapacaktır."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1118,89 +1233,63 @@ msgstr ""
 "ve bir <guilabel>ağ profili</guilabel>ni seçmek mümkündür. Açılır menü "
 "listesinden <xref linkend=\"draknetprofile\"/>e bakın."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Otomatik oturum açmayı ayarlayın"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Oturum ID</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot</"
-"emphasis> yazarak çalıştırabilirsiniz."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"Bu aygıt<placeholder type=\"footnote\" id=\"0\"/>parola sormadan aynı "
-"kullanıcının kendi masaüstü ortamına kendiliğinden giriş yapmasını sağlar. "
-"Otomatik giriş olarak adlandırılır.   Makineyi kullanacak tek bir kullanıcı "
-"varsa bu genellikle iyi bir fikirdir."
+"<guilabel>Gelişmiş</guilabel> ekranında; açılır menüler yardımıyla "
+"<guilabel>Ekran kipi</guilabel>ni, bir <guilabel>initrd</guilabel> dosyasını "
+"ve bir <guilabel>ağ profili</guilabel>ni seçmek mümkündür. Açılır menü "
+"listesinden <xref linkend=\"draknetprofile\"/>e bakın."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Mageia Denetim Merkezinde <emphasis role=\"bold\">Önyükleme</emphasis> "
-"sekmesi altında \"Otomatik oturum açmayı ayarlayın\" etiketi altında bulunur."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Arayüz düğmeleri oldukça açıktır:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Eğer X Window System önyükleme sonrası çalıştırılacaksa <guibutton>Grafiksel "
-"ortam açılışta çalıştırılsın</guibutton> kutusunu işaretleyin. Aksi durumda "
-"sistem metin kipinde başlatılacaktır. Yine de grafik arayüzü elle başlatmak "
-"mümkün olacaktır. Bu ise 'startx' veya 'systemctl start dm' komutunu "
-"çalıştırarak yapılabilir."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Eğer ilk kutu işaretlenmiş ise, diğer iki seçeneğe erişilebilir, eğer "
-"sistemin hangi kullanıcının oturum açacağını (ve parola) sormaya devam "
-"etmesini istiyorsanız <guibutton>Hayır, otomatik oturum açma istemiyorum</"
-"guibutton> ya da  gerekliyse <guibutton>Evet, şununla (kullanıcı, masaüstü) "
-"otomatik oturum açmak istiyorum</guibutton> işaretleyin. Bu durumda ayrıca  "
-"<guilabel>Varsayılan kullanıcı adı</guilabel>nı ve <guilabel>Varsayılan "
-"masaüstü</guilabel>nü girmeniz gerekir. "
+"Bu aracı komut satırında kök olarak <emphasis role=\"bold\">drakboot</"
+"emphasis> yazarak çalıştırabilirsiniz."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2600,22 +2689,22 @@ msgstr ""
 "olmadığını düşünüyoruz. "
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Disk bölümlerini yönet"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk veya diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2626,7 +2715,7 @@ msgstr ""
 "başlatabilirsiniz."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2641,7 +2730,7 @@ msgstr ""
 "etmek istediğinize emin değilseniz <emphasis>Çıkış</emphasis>a tıklayınız."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2650,12 +2739,12 @@ msgstr ""
 "vb.) üzerinde çalışmak istediğiniz sabit diske geçebilirsiniz."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2672,9 +2761,17 @@ msgstr ""
 "silmek içindir, sağ taraftaki diğer düğmeler bir bölüme tıkladığınızda "
 "görünür olur."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2684,12 +2781,12 @@ msgstr ""
 "bölümün ayırılması gerekir."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr "Bir bölümün sadece sağ tarafını yeniden boyutlandırmak mümkündür."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2701,20 +2798,21 @@ msgstr ""
 "\">Oluştur</guibutton> düğmesi görünecektir."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr "Varolmayan bir bağlama noktaı seçebilirsiniz, oluşturulacaktır."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "<emphasis><guibutton>Uzman moduna geç</guibutton></emphasis> seçilerek, "
@@ -2722,7 +2820,7 @@ msgstr ""
 "işlemler gelir."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7552,13 +7650,14 @@ msgstr "Önyükleme aşamalarını yapılandırın"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10452,10 +10551,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Bu araç<placeholder type=\"footnote\" id=\"0\"/> Mageia Denetim Merkezinde "
 "<emphasis role=\"bold\">Sistem</emphasis> sekmesinde <guilabel>Windows(TM) "
@@ -11248,6 +11348,9 @@ msgstr ""
 "koruma veya kabul etme fırsatı vardır. Bu durumda, yeni yapılandırmanın "
 "etkili olabilmesi için bağlantıyı kapatıp yeniden bağlanmalısınız."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"
diff --git a/docs/mcc-help/uk.po b/docs/mcc-help/uk.po
index cdfd6f97..cc0fa767 100644
--- a/docs/mcc-help/uk.po
+++ b/docs/mcc-help/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2015-05-23 09:31+0300\n"
+"POT-Creation-Date: 2016-02-10 16:30+0200\n"
 "PO-Revision-Date: 2015-05-23 09:34+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
@@ -876,7 +876,98 @@ msgstr ""
 "адміністратором мережі."
 
 #. type: Content of: <section><info><title>
-#: en/drakboot--boot.xml:3
+#: en/drakautologin.xml:3
+msgid "Set up autologin to automatically log in"
+msgstr "Налаштовування автореєстрації"
+
+#. type: Content of: <section><info><subtitle>
+#: en/drakautologin.xml:6
+#, fuzzy
+msgid "drakautologin"
+msgstr "drakauth"
+
+#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
+#: en/drakautologin.xml:11
+#, fuzzy
+msgid "drakautologin.png"
+msgstr "drakauth.png"
+
+#. type: Content of: <section><para><footnote><para>
+#: en/drakautologin.xml:16
+#, fuzzy
+msgid ""
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakautologin</emphasis> as root."
+msgstr ""
+"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
+"<emphasis role=\"bold\">drakauth</emphasis> від імені адміністратора (root)."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:15
+msgid ""
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
+"automatically login the same user, in her/his desktop environment, without "
+"asking for any password. It's called autologin.  This is generally a good "
+"idea when there is only one user like to be using the machine."
+msgstr ""
+"За допомогою цієї програми<placeholder type=\"footnote\" id=\"0\"/> можна "
+"наказати системі завантажуватися до облікового запису того самого "
+"користувача та до того самого стільничного середовища без потреби у введенні "
+"пароля. Така можливість називається автореєстрацією. Зазвичай, такий спосіб "
+"завантаження є зручним, якщо комп’ютером буде користуватися лише один "
+"користувач."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:22
+msgid ""
+"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
+"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+msgstr ""
+"Доступ до цієї програми можна отримати за допомогою сторінки <emphasis role="
+"\"bold\">«Завантаження»</emphasis> Центру керування Mageia. Пункт підписано "
+"«Налаштувати автореєстрацію»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:26
+msgid "The interface buttons are pretty obvious:"
+msgstr "Призначення кнопок інтерфейсу є доволі очевидним:"
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:28
+msgid ""
+"Check <guibutton>Launch the graphical environment when your system starts</"
+"guibutton>, if you want X Window System to be executed after the boot. If "
+"not, the system will start in text mode. Nevertheless, it will be possible "
+"to launch the graphic interface manually. This can be done by launching the "
+"command 'startx' or 'systemctl start dm'."
+msgstr ""
+"Позначте пункт <guibutton>Запускати графічну оболонку при завантаженні</"
+"guibutton>, якщо ви хочете запускати систему X Window під час завантаження. "
+"Якщо пункт позначено не буде, система запускатиметься у текстовому режимі. "
+"Втім, графічний інтерфейс можна буде запустити з текстового. Зробити це "
+"можна за допомогою команди «startx» або «systemctl start dm»."
+
+#. type: Content of: <section><para>
+#: en/drakautologin.xml:34
+msgid ""
+"If the first box is checked, two other options are available, check either "
+"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
+"continue to ask for which user to connect (and password) or check "
+"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
+"needed. In this case, you also need to supply the <guilabel>Default "
+"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+msgstr ""
+"Якщо буде позначено перший пункт, ви отримаєте доступу до двох інших "
+"пунктів. Ви можете вибрати пункт <guibutton>Ні, мені не потрібна автоматична "
+"реєстрація</guibutton>, якщо ви хочете, щоб система продовжувала запитувати "
+"вас про те, до якого з облікових записів користувачів слід увійти, і просити "
+"ввести пароль. Іншим варіантом є позначення пункту <guibutton>Так, я хочу "
+"реєструватися в системі з цим (іменем, стільницею)</guibutton>, у цьому "
+"випадку вам слід вказати значення для пунктів <guilabel>Типовий користувач</"
+"guilabel> і <guilabel>Типова стільниця</guilabel>."
+
+#. type: Content of: <section><info><title>
+#: en/drakboot--boot.xml:3 en/drakboot.xml:3
 msgid "Set up boot system"
 msgstr "Налаштовування способу завантаження системи"
 
@@ -886,23 +977,24 @@ msgid "drakboot --boot"
 msgstr "drakboot --boot"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:10
+#: en/drakboot--boot.xml:10 en/drakboot.xml:10
 msgid "drakboot--boot.png"
 msgstr "drakboot--boot.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:14
+#: en/drakboot--boot.xml:14 en/drakboot.xml:14
+#, fuzzy
 msgid ""
-"If you are using an UEFI system, the user interface is slightly different as "
-"you cannot choose the boot loader (first drop down list) since only one is "
-"available."
+"If you are using a UEFI system instead of BIOS, the user interface is "
+"slightly different as you cannot choose the boot loader (first drop down "
+"list) since only one is available."
 msgstr ""
 "Якщо ви користуєтеся системою з UEFI system, інтерфейс користувача трохи "
 "відрізнятиметься, оскільки ви не зможете вибрати завантажувач (з першого "
 "спадного списку), — тут вибір буде однозначним."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:20
+#: en/drakboot--boot.xml:20 en/drakboot.xml:20
 msgid "drakboot--boot2.png"
 msgstr "drakboot--boot2.png"
 
@@ -917,9 +1009,10 @@ msgstr ""
 "(root)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:24
+#: en/drakboot--boot.xml:24 en/drakboot.xml:24
+#, fuzzy
 msgid ""
-"this tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
+"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to configure "
 "the boot options (choice of the bootloader, set a password, the default "
 "boot, etc.)"
 msgstr ""
@@ -928,17 +1021,18 @@ msgstr ""
 "встановити пароль, визначити типовий варіант завантаження тощо)."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:29
+#: en/drakboot--boot.xml:29 en/drakboot.xml:29
+#, fuzzy
 msgid ""
-"It is found under the Boot tab in the Mageia Control Center labelled \"Set "
-"up boot system\"."
+"It is found under the Boot tab in the Mageia Control Center labeled \"Set up "
+"boot system\"."
 msgstr ""
 "Доступ до цієї програми можна отримати за допомогою сторінки «Завантаження» "
 "Центру керування Mageia. Пункт підписано «Налаштувати спосіб завантаження "
 "системи»."
 
 #. type: Content of: <section><warning><para>
-#: en/drakboot--boot.xml:33
+#: en/drakboot--boot.xml:33 en/drakboot.xml:33
 msgid ""
 "Don't use this tool if you don't know exactly what you are doing.  Changing "
 "some settings may prevent your machine from booting again !"
@@ -948,15 +1042,16 @@ msgstr ""
 "завантаженню вашої системи!"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:38
+#: en/drakboot--boot.xml:38 en/drakboot.xml:38
+#, fuzzy
 msgid ""
-"In the first part, called <guilabel>Bootloader</guilabel>, it is possible to "
-"choose which <guibutton>Bootloader to use</guibutton>, Grub or Lilo, and "
-"with a graphical or a text menu. It is just a question of taste, there are "
-"no other consequences. You can also set the <guibutton>Boot device</"
-"guibutton>, don't change anything here unless you are an expert. The boot "
-"device is where the bootloader is installed and any modification can prevent "
-"you machine from booting."
+"In the first part, called <guilabel>Bootloader</guilabel>, it is possible if "
+"using BIOS, to choose which <guibutton>Bootloader to use</guibutton>, Grub, "
+"Grub2 or Lilo, and with a graphical or a text menu.  It is just a question "
+"of taste, there are no other consequences. You can also set the "
+"<guibutton>Boot device</guibutton>, don't change anything here unless you "
+"are an expert. The boot device is where the bootloader is installed and any "
+"modification can prevent your machine from booting."
 msgstr ""
 "За допомогою першої групи з назвою <guilabel>Завантажувач</guilabel> можна "
 "вибрати завантажувач, який слід використовувати, Grub or Lilo, та визначити "
@@ -968,12 +1063,21 @@ msgstr ""
 "зміни можуть завадити завантаженню системи."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:46
+#: en/drakboot--boot.xml:46 en/drakboot.xml:46
+msgid ""
+"In UEFI system, the bootloader is <guilabel>Grub2-efi</guilabel> and is "
+"installed in /boot/EFI partition. This FAT32 formatted partition is common "
+"to all operating systems installed."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakboot--boot.xml:50 en/drakboot.xml:50
+#, fuzzy
 msgid ""
 "In the second part, called <guilabel>Main options</guilabel>, you can set "
 "the <guibutton>Delay before booting default image</guibutton>, in seconds. "
-"During this delay, grub or Lilo will display the list of available operating "
-"systems, prompting you to make your choice, if no selection is made, the "
+"During this delay, Grub or Lilo will display the list of available operating "
+"systems, prompting you to make your choice. If no selection is made, the "
 "bootloader will boot the default one once the delay elapses."
 msgstr ""
 "За допомогою другої групи, <guilabel>Основні параметри</guilabel>, ви можете "
@@ -983,7 +1087,7 @@ msgstr ""
 "буде здійснено, завантажувачем буде завантажено типову систему."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:53
+#: en/drakboot--boot.xml:57 en/drakboot.xml:57
 msgid ""
 "In the third and last part, called <guibutton>Security</guibutton>, it is "
 "possible to set a password."
@@ -992,19 +1096,19 @@ msgstr ""
 "<guibutton>Безпека</guibutton>, можна встановити пароль до завантажувача."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:56
+#: en/drakboot--boot.xml:60 en/drakboot.xml:60
 msgid "The <guibutton>Advanced</guibutton> button gives some extra options."
 msgstr ""
 "За допомогою кнопки <guibutton>Додатково</guibutton> можна отримати доступ "
 "до додаткових параметрів."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:59
+#: en/drakboot--boot.xml:63 en/drakboot.xml:63
 msgid "<guibutton>Enable ACPI:</guibutton>"
 msgstr "<guibutton>Увімкнути ACPI:</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:61
+#: en/drakboot--boot.xml:65 en/drakboot.xml:65
 msgid ""
 "ACPI (Advanced Configuration and Power Interface) is a standard for the "
 "power management. It can save energy by stopping unused devices, this was "
@@ -1018,12 +1122,12 @@ msgstr ""
 "якщо ваше обладнання є сумісним з ACPI."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:66
+#: en/drakboot--boot.xml:70 en/drakboot.xml:70
 msgid "<guibutton>Enable SMP:</guibutton>"
 msgstr "<guibutton>Увімкнути SMP</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:68
+#: en/drakboot--boot.xml:72 en/drakboot.xml:72
 msgid ""
 "SMP stands for Symmetric Multi Processors, it's an architecture for "
 "multicore processors."
@@ -1032,7 +1136,7 @@ msgstr ""
 "багатпроцесорність), так називається архітектура багатопроцесорних систем."
 
 #. type: Content of: <section><note><para>
-#: en/drakboot--boot.xml:72
+#: en/drakboot--boot.xml:76 en/drakboot.xml:76
 msgid ""
 "If you have a processor with HyperThreading, Mageia will see it as a dual "
 "processor and enable SMP."
@@ -1041,7 +1145,7 @@ msgstr ""
 "HyperThreading, Mageia визначить його як подвійний процесор і увімкне SMP."
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:76
+#: en/drakboot--boot.xml:80 en/drakboot.xml:80
 msgid ""
 "<guibutton>Enable APIC</guibutton> and <guibutton>Enable Local APIC:</"
 "guibutton>"
@@ -1050,7 +1154,7 @@ msgstr ""
 "</guibutton>"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:79
+#: en/drakboot--boot.xml:83 en/drakboot.xml:83
 msgid ""
 "APIC stands for Advanced Programmable Interrupt Controller. There are two "
 "components in the Intel APIC system, the local APIC (LAPIC) and the I/O "
@@ -1073,20 +1177,34 @@ msgstr ""
 "локальний APIC."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:90
+#: en/drakboot--boot.xml:94 en/drakboot.xml:94
 msgid "drakboot1.png"
 msgstr "drakboot1.png"
 
 #. type: Content of: <section><para>
-#: en/drakboot--boot.xml:94
+#: en/drakboot--boot.xml:98 en/drakboot.xml:98
+msgid ""
+"The <guibutton>Next</guibutton> screen differs depending on whether you have "
+"an <emphasis>BIOS</emphasis> or <emphasis>UEFI</emphasis> system."
+msgstr ""
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:104 en/drakboot.xml:104
+#, fuzzy
+msgid "You have a <emphasis>BIOS</emphasis> system:"
+msgstr "<emphasis>Ідентифікатор користувача</emphasis>"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:106 en/drakboot.xml:106
+#, fuzzy
 msgid ""
-"In the <guibutton>Next</guibutton> screen, you can see the list of all the "
-"available entries at boot time. The default one is asterisked. To change the "
-"order of the menu entries, click on the up or down arrows to move the "
-"selected item. If you click on the <guibutton>Add</guibutton> or "
-"<guibutton>Modify </guibutton>buttons, a new window appears to add a new "
-"entry in the Grub menu or to modify an existing one. You need to be familiar "
-"with Lilo or Grub to be able to use these tools."
+"In this case, you can see the list of all the available entries at boot "
+"time. The default one is asterisked. To change the order of the menu "
+"entries, click on the up or down arrows to move the selected item.  If you "
+"click on the <guibutton>Add</guibutton> or <guibutton>Modify</guibutton> "
+"buttons, a new window appears to add a new entry in the bootloader menu or "
+"to modify an existing one. You need to be familiar with Lilo or Grub to be "
+"able to use these tools."
 msgstr ""
 "Після натискання кнопки <guibutton>Далі</guibutton> ви побачите список усіх "
 "доступних пунктів меню завантаження. Типовий пункт позначено зірочкою. Щоб "
@@ -1097,13 +1215,13 @@ msgstr ""
 "Grub або змінити вже наявний пункт меню. Не використовуйте ці кнопки, якщо "
 "ви не знайомі з синтаксисом команд Lilo або Grub."
 
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot--boot.xml:104
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:116 en/drakboot.xml:116
 msgid "drakboot2.png"
 msgstr "drakboot2.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:108
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:120 en/drakboot.xml:120
 msgid ""
 "The <guilabel>Label</guilabel> field is freeform, write here what you want "
 "to be displayed in the menu. It matches the Grub command \"title\". For "
@@ -1113,8 +1231,8 @@ msgstr ""
 "вписати будь-що, що хочете бачити у меню. Цей пункт відповідає команді Grub "
 "«title». Приклад: Mageia3."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:112
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:124 en/drakboot.xml:124
 msgid ""
 "The <guilabel>Image</guilabel> field contains the kernel name. It matches "
 "the Grub command \"kernel\". For example /boot/vmlinuz."
@@ -1122,8 +1240,8 @@ msgstr ""
 "У полі <guilabel>Образ</guilabel> має бути вказано назву ядра. Цей пункт "
 "відповідає команді Grub «kernel». Приклад: /boot/vmlinuz."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:115
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:127 en/drakboot.xml:127
 msgid ""
 "The <guilabel>Root</guilabel> field contains the device name where the "
 "kernel is stored. It matches the Grub command \"root\". For example (hd0,1)."
@@ -1132,8 +1250,9 @@ msgstr ""
 "зберігається ядро. Цей пункт відповідає команді Grub «root». Приклад: "
 "(hd0,1)."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:119
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:131 en/drakboot--boot.xml:156 en/drakboot.xml:131
+#: en/drakboot.xml:156
 msgid ""
 "The <guilabel>Append</guilabel> field contains the options to be given to "
 "the kernel at boot time."
@@ -1141,8 +1260,8 @@ msgstr ""
 "У полі <guilabel>Приєднати</guilabel> має бути вказано параметри, які "
 "передаються ядру під час завантаження."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:122
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:134 en/drakboot.xml:134
 msgid ""
 "If the box <guilabel>Default</guilabel> is checked, Grub will boot this "
 "entry by default."
@@ -1150,8 +1269,8 @@ msgstr ""
 "Якщо буде позначено пункт <guilabel>Основна</guilabel>, Grub завантажуватиме "
 "відповідну систему як основну."
 
-#. type: Content of: <section><para>
-#: en/drakboot--boot.xml:125
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:137 en/drakboot.xml:137
 msgid ""
 "In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
 "choose the <guilabel>Video mode</guilabel>, an <guilabel>initrd</guilabel> "
@@ -1160,96 +1279,66 @@ msgid ""
 msgstr ""
 "За допомогою додаткового вікна, відкрити яке можна натисканням кнопки "
 "<guilabel>Додатково</guilabel>, <guilabel>Режим відео</guilabel>, "
-"<guilabel>initrd</guilabel> та <guilabel>Мережевий профіль</guilabel>, див. <"
-"xref linkend=\"draknetprofile\"/>, зі спадних списків."
+"<guilabel>initrd</guilabel> та <guilabel>Мережевий профіль</guilabel>, див. "
+"<xref linkend=\"draknetprofile\"/>, зі спадних списків."
 
-#. type: Content of: <section><info><title>
-#: en/drakboot.xml:3
-msgid "Set up autologin to automatically log in"
-msgstr "Налаштовування автореєстрації"
-
-#. type: Content of: <section><info><subtitle>
-#: en/drakboot.xml:6
-msgid "drakboot"
-msgstr "drakboot"
-
-#. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakboot.xml:11
-msgid "drakboot.png"
-msgstr "drakboot.png"
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:145 en/drakboot.xml:145
+#, fuzzy
+msgid "You have a <emphasis>UEFI</emphasis> system:"
+msgstr "<emphasis>Ідентифікатор користувача</emphasis>"
 
-#. type: Content of: <section><para><footnote><para>
-#: en/drakboot.xml:16
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:147 en/drakboot.xml:147
 msgid ""
-"You can start this tool from the command line, by typing <emphasis role="
-"\"bold\">drakboot</emphasis> as root."
+"In this case, the drop-down list displays all the available entries; click "
+"on the one wanted as the default one."
 msgstr ""
-"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
-"<emphasis role=\"bold\">drakboot</emphasis> від імені адміністратора (root)."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:15
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:152 en/drakboot.xml:152
+#, fuzzy
+msgid "drakboot3.png"
+msgstr "drakboot.png"
+
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:159 en/drakboot.xml:159
+#, fuzzy
 msgid ""
-"This tool<placeholder type=\"footnote\" id=\"0\"/> allows you to "
-"automatically login the same user, in her/his desktop environment, without "
-"asking for any password. It's called autologin.  This is generally a good "
-"idea when there is only one user like to be using the machine."
+"In the extra screen called <guilabel>Advanced</guilabel>, it is possible to "
+"choose the <guilabel>Video mode</guilabel>."
 msgstr ""
-"За допомогою цієї програми<placeholder type=\"footnote\" id=\"0\"/> можна "
-"наказати системі завантажуватися до облікового запису того самого "
-"користувача та до того самого стільничного середовища без потреби у введенні "
-"пароля. Така можливість називається автореєстрацією. Зазвичай, такий спосіб "
-"завантаження є зручним, якщо комп’ютером буде користуватися лише один "
-"користувач."
+"За допомогою додаткового вікна, відкрити яке можна натисканням кнопки "
+"<guilabel>Додатково</guilabel>, <guilabel>Режим відео</guilabel>, "
+"<guilabel>initrd</guilabel> та <guilabel>Мережевий профіль</guilabel>, див. "
+"<xref linkend=\"draknetprofile\"/>, зі спадних списків."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:22
+#. type: Content of: <section><itemizedlist><listitem><para>
+#: en/drakboot--boot.xml:162 en/drakboot.xml:162
 msgid ""
-"It is found under the <emphasis role=\"bold\">Boot</emphasis> tab in the "
-"Mageia Control Center labelled \"Set up autologin to automatically log in\"."
+"To set many other parameters, you can use <emphasis>Grub Customize</"
+"emphasis>r, available in the Mageia repositories (see below)."
 msgstr ""
-"Доступ до цієї програми можна отримати за допомогою сторінки <emphasis role="
-"\"bold\">«Завантаження»</emphasis> Центру керування Mageia. Пункт підписано "
-"«Налаштувати автореєстрацію»."
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:26
-msgid "The interface buttons are pretty obvious:"
-msgstr "Призначення кнопок інтерфейсу є доволі очевидним:"
+#. type: Attribute 'fileref' of: <section><itemizedlist><listitem><mediaobject><imageobject><imagedata>
+#: en/drakboot--boot.xml:168 en/drakboot.xml:168
+#, fuzzy
+msgid "drakboot4.png"
+msgstr "drakboot.png"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:28
-msgid ""
-"Check <guibutton>Launch the graphical environment when your system starts</"
-"guibutton>, if you want X Window System to be executed after the boot. If "
-"not, the system will start in text mode. Nevertheless, it will be possible "
-"to launch the graphic interface manually. This can be done by launching the "
-"command 'startx' or 'systemctl start dm'."
-msgstr ""
-"Позначте пункт <guibutton>Запускати графічну оболонку при завантаженні</"
-"guibutton>, якщо ви хочете запускати систему X Window під час завантаження. "
-"Якщо пункт позначено не буде, система запускатиметься у текстовому режимі. "
-"Втім, графічний інтерфейс можна буде запустити з текстового. Зробити це "
-"можна за допомогою команди «startx» або «systemctl start dm»."
+#. type: Content of: <section><info><subtitle>
+#: en/drakboot.xml:5
+msgid "drakboot"
+msgstr "drakboot"
 
-#. type: Content of: <section><para>
-#: en/drakboot.xml:34
+#. type: Content of: <section><para><footnote><para>
+#: en/drakboot.xml:25
 msgid ""
-"If the first box is checked, two other options are available, check either "
-"<guibutton>No, I don't want autologin</guibutton>, if you want the system to "
-"continue to ask for which user to connect (and password) or check "
-"<guibutton>Yes, I want autologin with this (user, desktop)</guibutton>, if "
-"needed. In this case, you also need to supply the <guilabel>Default "
-"username</guilabel> and the <guilabel>Default desktop</guilabel>."
+"You can start this tool from the command line, by typing <emphasis role="
+"\"bold\">drakboot</emphasis> as root."
 msgstr ""
-"Якщо буде позначено перший пункт, ви отримаєте доступу до двох інших "
-"пунктів. Ви можете вибрати пункт <guibutton>Ні, мені не потрібна автоматична "
-"реєстрація</guibutton>, якщо ви хочете, щоб система продовжувала запитувати "
-"вас про те, до якого з облікових записів користувачів слід увійти, і просити "
-"ввести пароль. Іншим варіантом є позначення пункту <guibutton>Так, я хочу "
-"реєструватися в системі з цим (іменем, стільницею)</guibutton>, у цьому "
-"випадку вам слід вказати значення для пунктів <guilabel>Типовий користувач</"
-"guilabel> і <guilabel>Типова стільниця</guilabel>."
+"Запустити цю програму можна за допомогою термінала: достатньо ввести команду "
+"<emphasis role=\"bold\">drakboot</emphasis> від імені адміністратора (root)."
 
 #. type: Content of: <section><info><title>
 #: en/drakbug_report.xml:11
@@ -2696,22 +2785,22 @@ msgstr ""
 "про що йдеться."
 
 #. type: Content of: <section><info><title>
-#: en/drakdisk.xml:8
+#: en/drakdisk.xml:5
 msgid "Manage disk partitions"
 msgstr "Керування розділами диска"
 
 #. type: Content of: <section><info><subtitle>
-#: en/drakdisk.xml:10
+#: en/drakdisk.xml:7
 msgid "drakdisk or diskdrake"
 msgstr "drakdisk або diskdrake"
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:15
+#: en/drakdisk.xml:12
 msgid "drakdiskBackup.png"
 msgstr "drakdiskBackup.png"
 
 #. type: Content of: <section><warning><para><footnote><para>
-#: en/drakdisk.xml:21
+#: en/drakdisk.xml:18
 msgid ""
 "You can start this tool from the command line, by typing <emphasis role="
 "\"bold\">drakdisk</emphasis> or <emphasis role=\"bold\">diskdrake</emphasis> "
@@ -2722,7 +2811,7 @@ msgstr ""
 "\">diskdrake</emphasis> від імені адміністратора (root)."
 
 #. type: Content of: <section><warning><para>
-#: en/drakdisk.xml:20
+#: en/drakdisk.xml:17
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is very powerful, a tiny "
 "error or a cat jumping on your keyboard can lead to losing all data on a "
@@ -2738,7 +2827,7 @@ msgstr ""
 "продовжувати роботу з програмою."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:30
+#: en/drakdisk.xml:27
 msgid ""
 "If you have more than one hard disk, you can switch to the hard disk you "
 "want to work on by selecting the correct tab (sda, sdb, sdc etc)."
@@ -2747,12 +2836,12 @@ msgstr ""
 "потрібний вам жорсткий диск вибором відповідної вкладки (sda, sdb, sdc тощо)."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:35
+#: en/drakdisk.xml:32
 msgid "drakdisk.png"
 msgstr "drakdisk.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:39
+#: en/drakdisk.xml:36
 msgid ""
 "You can choose from many actions to adjust your hard disk to your "
 "preferences. Wiping an entire hard disk, splitting or merging partitions, "
@@ -2771,9 +2860,17 @@ msgstr ""
 "розташованих праворуч, можна отримати після натискання розділу на картинці "
 "диска."
 
-#. type: Content of: <section><para>
+#. type: Content of: <section><note><para>
 #: en/drakdisk.xml:47
 msgid ""
+"If you have an UEFI system, you can see a small partition called \"EFI "
+"System Partition\" and mounted on /boot/EFI. Never delete it, because it "
+"contains all your different operating systems bootloaders."
+msgstr ""
+
+#. type: Content of: <section><para>
+#: en/drakdisk.xml:52
+msgid ""
 "If the selected partition is mounted, like in the example below, you cannot "
 "choose to resize, format or delete it. To be able to do that the partition "
 "must be unmounted first."
@@ -2784,13 +2881,13 @@ msgstr ""
 "розділ."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:51
+#: en/drakdisk.xml:56
 msgid "It is only possible to resize a partition on its right side"
 msgstr ""
 "Зміну розмірів розділу можна виконувати лише за рахунок правої межі розділу."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:53
+#: en/drakdisk.xml:58
 msgid ""
 "To change a partition type (change ext3 to ext4 for example) you have to "
 "delete the partition and then re-create it with the new type. The button "
@@ -2803,22 +2900,23 @@ msgstr ""
 "<guibutton role=\"bold\">Створити</guibutton>."
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:58
+#: en/drakdisk.xml:63
 msgid "You can choose a mount point that doesn't exist, it will be created."
 msgstr ""
 "Ви можете вибрати точку монтування, якої не існує. Якщо буде здійснено такий "
 "вибір, відповідну точку монтування буде створено."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:63
+#: en/drakdisk.xml:68
 msgid "drakdiskMountedPartition.png"
 msgstr "drakdiskMountedPartition.png"
 
 #. type: Content of: <section><para>
-#: en/drakdisk.xml:67
+#: en/drakdisk.xml:72
+#, fuzzy
 msgid ""
 "Selecting <emphasis><guibutton>Toggle to expert mode</guibutton></emphasis> "
-"gives some extra available actions, like labelling the partition, as can be "
+"gives some extra available actions, like labeling the partition, as can be "
 "seen in the screenshot below."
 msgstr ""
 "Натискання кнопки <emphasis><guibutton>Перемкнути в режим експерта</"
@@ -2826,7 +2924,7 @@ msgstr ""
 "визначення мітки розділу, як це показано на наведеному нижче знімку."
 
 #. type: Attribute 'fileref' of: <section><mediaobject><imageobject><imagedata>
-#: en/drakdisk.xml:73
+#: en/drakdisk.xml:78
 msgid "drakdiskExpertUnmounted.png"
 msgstr "drakdiskExpertUnmounted.png"
 
@@ -7814,13 +7912,14 @@ msgstr "Налаштовування послідовності завантаж
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:21
-msgid "<xref linkend=\"drakboot\"/>"
+#, fuzzy
+msgid "<xref linkend=\"drakautologin\"/>"
 msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:25
-msgid "<xref linkend=\"drakboot--boot\"/>"
-msgstr "<xref linkend=\"drakboot--boot\"/>"
+msgid "<xref linkend=\"drakboot\"/>"
+msgstr "<xref linkend=\"drakboot\"/>"
 
 #. type: Content of: <section><orderedlist><listitem><para>
 #: en/mcc-boot.xml:29
@@ -10807,10 +10906,11 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/transfugdrake.xml:21
+#, fuzzy
 msgid ""
 "This tool<placeholder type=\"footnote\" id=\"0\"/> is found under the "
 "<emphasis role=\"bold\">System</emphasis> tab in the Mageia Control Center "
-"labelled <guilabel>Import Windows(TM) documents and settings</guilabel>"
+"labeled <guilabel>Import Windows(TM) documents and settings</guilabel>"
 msgstr ""
 "Доступ до цього інструмента<placeholder type=\"footnote\" id=\"0\"/> можна "
 "отримати за допомогою сторінки <emphasis role=\"bold\">Система</emphasis> "
@@ -11646,6 +11746,9 @@ msgstr ""
 "підтверджено, вам доведеться вийти з облікового запису і знову увійти до "
 "нього, щоб задіяти внесені зміни."
 
+#~ msgid "<xref linkend=\"drakboot--boot\"/>"
+#~ msgstr "<xref linkend=\"drakboot--boot\"/>"
+
 #~ msgid ""
 #~ "This tool<placeholder type=\"footnote\" id=\"0\"/> is present in the "
 #~ "Mageia Control Center under the tab <emphasis role=\"bold\">Hardware</"