Massive update to unfuzzy correct translations

27 files changed, 3344 insertions, 3256 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index f082b332..90b05c03 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -1,27 +1,28 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Cristian Garde Zarza <cristian.garde@gmail.com>, 2015
-# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2013-2014
-# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2015
-# Davidmp <medipas@gmail.com>, 2016
-# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015
+# Cristian Garde Zarza <cristian.garde@gmail.com>, 2015.
+# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2013-2014.
+# Francesc Pinyol Margalef <francesc.pinyol.m@gmail.com>, 2015.
+# Davidmp <medipas@gmail.com>, 2016.
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-11 16:57+0000\n"
-"Last-Translator: Davidmp <medipas@gmail.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:33+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "ca/)\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -108,9 +109,9 @@ msgstr "ca"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selecció dels suports (configura suports d'instal·lació suplementaris)"
 
-#.  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 ""
@@ -182,18 +183,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestió d'usuaris i superusuari"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -425,17 +426,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Tria dels punts de muntatge"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -613,9 +614,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -703,14 +704,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -897,8 +896,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configuració dels serveis"
 
-#.  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 ""
@@ -950,8 +949,8 @@ msgstr "Canvieu coses només si teniu molt clar què esteu fent."
 msgid "Configure your Timezone"
 msgstr "Configuració de la zona horària"
 
-#.  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 ""
@@ -1779,9 +1778,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Enhorabona"
 
-#.  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
@@ -1840,10 +1839,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatació"
 
-#.  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 ""
@@ -2312,10 +2311,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Actualitzacions"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2359,13 +2358,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectMouse.png\" align=\"center\" "
-"format=\"PNG\" > </imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2388,18 +2386,20 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
+"Els podeu trobar <link linkend=\"https://wiki.mageia.org/en/Category:Documenta"
+"tion\">aquí</link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr "Selecció del suport (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2539,18 +2539,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resum dels paràmetres diversos"
 
-#.  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" 
+#. 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
@@ -2905,8 +2905,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Nivell de seguretat"
 
-#.  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 ""
@@ -3486,16 +3486,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3549,8 +3554,8 @@ msgstr "Desconnecteu el llapis de memòria USB, ja està"
 msgid "Select your Country / Region"
 msgstr "Selecció de país / regió"
 
-#.  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 ""
@@ -3906,10 +3911,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Selecció del ratolí"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3953,7 +3958,6 @@ msgstr "Addició o modificació d'una entrada al menú d'arrencada"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3962,11 +3966,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3995,15 +4000,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4074,7 +4078,6 @@ msgstr "Opcions principals del menú d'arrencada"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4082,11 +4085,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4238,17 +4241,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.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 fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4272,14 +4272,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Configuració SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4319,7 +4319,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Configuració del so"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4398,12 +4398,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmació del disc dur que es formatarà"
 
-#.  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 
+#.     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 ""
@@ -4607,11 +4607,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
@@ -4619,3 +4620,4 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index f69b2070..91be20a4 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -1,30 +1,29 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Jan <hlafek99@gmail.com>, 2016
-# Jiří Vírava <appukonrad@gmail.com>, 2013-2014
-# Jiří Vírava <appukonrad@gmail.com>, 2013
-# Luděk Janča <joelp@email.cz>, 2015-2016
-# fri, 2016
-# fri, 2016
-# VlciStopa <vlcistopa.l@seznam.cz>, 2014
-# VlciStopa <vlcistopa.l@seznam.cz>, 2014
+# Jan <hlafek99@gmail.com>, 2016.
+# Jiří Vírava <appukonrad@gmail.com>, 2013-2014.
+# Jiří Vírava <appukonrad@gmail.com>, 2013.
+# Luděk Janča <joelp@email.cz>, 2015-2016.
+# fri, 2016.
+# VlciStopa <vlcistopa.l@seznam.cz>, 2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-07-16 09:09+0000\n"
-"Last-Translator: fri\n"
-"Language-Team: Czech (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:33+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "cs/)\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -116,9 +115,9 @@ msgstr "cs"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Výběr zdroje (nastavení doplňkových instalačních zdojů)"
 
-#.  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 ""
@@ -189,18 +188,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Správa uživatele  a superuživatele"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -445,17 +444,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Zvolte si přípojné body"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -655,9 +654,9 @@ msgstr "V zastaralém režimu BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -763,13 +762,12 @@ msgstr "V režimu UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -964,8 +962,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Nastavení služeb"
 
-#.  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 ""
@@ -1016,8 +1014,8 @@ msgstr "Věci měňte jen tehdy, když velmi dobře víte, co děláte."
 msgid "Configure your Timezone"
 msgstr "Nastavení časového pásma"
 
-#.  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 ""
@@ -1873,9 +1871,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
-#.  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
@@ -1935,10 +1933,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formátování"
 
-#.  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 ""
@@ -2470,10 +2468,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Aktualizace"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2518,13 +2516,12 @@ msgstr "Přihlašovací obrazovka"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2549,10 +2546,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Další část naší dokumentace můžete najít na <link linkend=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -2562,9 +2558,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Výběr zdrojů (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2720,18 +2716,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Souhrn různých parametrů"
 
-#.  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" 
+#. 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
@@ -3094,8 +3090,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Úroveň zabezpečení"
 
-#.  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 ""
@@ -3735,16 +3731,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3754,16 +3755,21 @@ 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"
@@ -3818,8 +3824,8 @@ msgstr "Odpojte vaše zařízení USB. Je hotovo."
 msgid "Select your Country / Region"
 msgstr "Vyberte zemi"
 
-#.  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 ""
@@ -4191,10 +4197,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Výběr myši"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4239,7 +4245,6 @@ msgstr "Přidaní nebo změna položky v nabídce zavaděče"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4248,9 +4253,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4283,15 +4291,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4372,7 +4379,6 @@ msgstr "Základní nastavení zaváděcího programu"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4380,11 +4386,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4550,16 +4556,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4590,14 +4594,14 @@ msgstr "Neupravujte \"Zaváděcí zařízení\", pokud s jistotou nevíte, co d�
 msgid "Setup SCSI"
 msgstr "Nastavení SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4636,7 +4640,7 @@ msgstr "DrakX by pak měl být schopen správně nastavit disk(y)."
 msgid "Sound Configuration"
 msgstr "Nastavení zvuku"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4714,12 +4718,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Potvrzení naformátování pevného disku"
 
-#.  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 
+#.     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 ""
@@ -4975,13 +4979,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/de.po b/docs/installer/de.po
index 0cbb8df1..fc9a1c55 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -1,33 +1,31 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015
-# Falco Preiseni <apfelkomplott2014@mailbox.org>, 2016
-# Marc Lattemann, 2013
-# psyca, 2014-2016
-# Marc Lattemann, 2013
-# Marc Lattemann, 2013-2014
-# psyca, 2014
-# psyca, 2014
-# user7 <wassipaul@gmx.at>, 2014
-# valsu <valsu@hylia.de>, 2015
-# user7 <wassipaul@gmx.at>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014-2015.
+# Falco Preiseni <apfelkomplott2014@mailbox.org>, 2016.
+# Marc Lattemann, 2013.
+# psyca, 2014-2016.
+# Marc Lattemann, 2013-2014.
+# psyca, 2014.
+# user7 <wassipaul@gmx.at>, 2014.
+# valsu <valsu@hylia.de>, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-23 18:07+0000\n"
-"Last-Translator: Falco Preiseni <apfelkomplott2014@mailbox.org>\n"
-"Language-Team: German (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:34+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "de/)\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -120,9 +118,9 @@ msgstr "de"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Medienauswahl (konfigurieren von zusätzlichen Installationsmedien)"
 
-#.  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 ""
@@ -196,18 +194,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Verwaltung des Benutzers und des Superusers"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -462,17 +460,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Einhängepunkte wählen"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -678,9 +676,9 @@ msgstr "Im BIOS/CSM/Legacy Modus"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -793,13 +791,12 @@ msgstr "Im UEFI Modus"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -999,8 +996,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfigurieren Ihrer Dienste"
 
-#.  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 ""
@@ -1056,8 +1053,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Konfiguration der Zeitzone"
 
-#.  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 ""
@@ -1945,9 +1942,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Herzlichen Glückwunsch!"
 
-#.  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
@@ -2008,10 +2005,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatieren"
 
-#.  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 ""
@@ -2570,10 +2567,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Aktualisierungen (Updates)"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2620,13 +2617,12 @@ msgstr "Anmeldebildschirm"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2652,10 +2648,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Sie können weitere Teile unserer Dokumentation im <link linkend=\"https://"
 "wiki.mageia.org/de/Kategorie:Dokumentation\">Mageia Wiki</link> finden."
@@ -2665,9 +2660,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Medienauswahl (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2825,18 +2820,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Zusammenfassung von verschiedenen Parameter"
 
-#.  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" 
+#. 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
@@ -3212,8 +3207,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Sicherheitsstufe"
 
-#.  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 ""
@@ -3868,16 +3863,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3887,16 +3887,21 @@ 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"
@@ -3951,8 +3956,8 @@ msgstr "Entferne den USB-Stick, es ist fertig"
 msgid "Select your Country / Region"
 msgstr "Wählen des Landes / der Region"
 
-#.  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 ""
@@ -4337,10 +4342,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Maus auswählen"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4386,7 +4391,6 @@ msgstr "Hinzufügen oder ändern eines Boot Menü Eintrags"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4395,9 +4399,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4431,15 +4438,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4523,7 +4529,6 @@ msgstr "Hauptoptionen des Bootloaders"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4531,11 +4536,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4706,16 +4711,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4748,14 +4751,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "SCSI-Laufwerke einrichten"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4795,7 +4798,7 @@ msgstr "Danach sollte DrakX die Laufwerke korrekt konfigurieren können."
 msgid "Sound Configuration"
 msgstr "Soundkonfiguration"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4873,12 +4876,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Bestätigen, dass die Festplatte formatiert wird"
 
-#.  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 
+#.     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 ""
@@ -5142,13 +5145,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/el.po b/docs/installer/el.po
index 01c5ec68..a8a2d6ea 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -5,13 +5,14 @@
 # Dimitrios Glentadakis <dglent@gmail.com>, 2013-2014, 2015, 2016.
 # Efstathios Iosifidis <iefstathios@gmail.com>, 2014.
 # JimSp472000 <jimspentzos2000@gmail.com>, 2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-17 08:40+0200\n"
-"Last-Translator: Dimitrios Glentadakis <dglent@free.fr>\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:34+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Greek <kde-i18n-el@kde.org>\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@@ -109,9 +110,9 @@ msgstr "el"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Επιλογή μέσων (Διαμόρφωση επιπρόσθετων μέσων εγκατάστασης)"
 
-#.  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 ""
@@ -183,18 +184,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Διαχείριση χρήστη και διαχειριστή"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -450,17 +451,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Επιλογή των σημείων προσάρτησης"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -667,9 +668,9 @@ msgstr "Στο BIOS/CSM/Λειτουργία παλαιού τύπου"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -777,13 +778,12 @@ msgstr "Σε λειτουργία UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -983,8 +983,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Διαμορφώστε τις υπηρεσίες σας"
 
-#.  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 ""
@@ -1037,8 +1037,8 @@ msgstr "Αλλάξτε κάτι μόνο αν γνωρίζετε πολύ καλ
 msgid "Configure your Timezone"
 msgstr "Διαμόρφωση της ζώνης ώρας"
 
-#.  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 ""
@@ -1920,9 +1920,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Συγχαρητήρια"
 
-#.  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
@@ -1983,10 +1983,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Μορφοποίηση"
 
-#.  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 ""
@@ -2537,10 +2537,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Ενημερώσεις"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2585,13 +2585,12 @@ msgstr "Οθόνη εισόδου"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2616,10 +2615,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Μπορείτε να βρείτε ένα άλλο τμήμα της τεκμηρίωσης στο <link ns4:href="
 "\"https://wiki.mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -2629,9 +2627,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Επιλογή μέσων (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2788,18 +2786,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Σύνοψη των διάφορων παραμέτρων"
 
-#.  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" 
+#. 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
@@ -3173,8 +3171,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Επίπεδο ασφάλειας"
 
-#.  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 ""
@@ -3827,16 +3825,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3846,16 +3849,21 @@ 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"
@@ -3911,8 +3919,8 @@ msgstr "Αποσυνδέστε το κλειδί USB, όλα ολοκληρώθ�
 msgid "Select your Country / Region"
 msgstr "Επιλέξτε τη χώρα/περιοχή σας"
 
-#.  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 ""
@@ -4294,10 +4302,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Επιλογή ποντικιού"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4342,7 +4350,6 @@ msgstr "Προσθήκη ή επεξεργασία μιας καταχώρηση
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4351,9 +4358,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4388,15 +4398,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4482,7 +4491,6 @@ msgstr "Κύριες επιλογές του προγράμματος εκκίν
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4490,11 +4498,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4662,16 +4670,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4705,14 +4711,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Διαμόρφωση SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4755,7 +4761,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Ρύθμιση του ήχου"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4835,12 +4841,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Επιβεβαίωση του σκληρού δίσκου προς μορφοποίηση"
 
-#.  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 
+#.     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 ""
@@ -5100,13 +5106,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/en/login.xml b/docs/installer/en/login.xml
index 235706ea..be1a0f7b 100644
--- a/docs/installer/en/login.xml
+++ b/docs/installer/en/login.xml
@@ -1,4 +1,3 @@
 <?xml version='1.0' encoding='UTF-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/docbook" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns5="http://www.w3.org/1999/xhtml" xmlns:ns6="http://www.w3.org/1999/xlink" xml:id="login" version="5.0"><info><title xml:id="label-to-adapt-ti1">Login screen</title></info><mediaobject condition="live"><imageobject><imagedata format="PNG" xml:id="login-im1" fileref="live-login.png" align="center" revision="1"/></imageobject><caption><para>KDM login screen</para></caption></mediaobject><para>Finally, you will come to the login screen.</para><para>Enter your user name and user password, and in a few seconds you will
   find yourself with a loaded KDE or GNOME desktop, depending on which live
-  medium you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link xmlns:ns0="http://www.w3.org/1999/xlink" ns0:href="../../installer/">the Mageia
-  wiki</link>.</para></section>
\ No newline at end of file
+  medium you used. You can now start using your Mageia installation.</para><para>You can find another part of our documentation in <link linkend="https://wiki.mageia.org/en/Category:Documentation">the Mageia wiki</link>.</para></section>
\ No newline at end of file
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index 47f101d0..6bb898d6 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -1,24 +1,25 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Anonymous, 2014
-# Pablo Foche <EMAIL@ADDRESS>, 2012-2013
+# Anonymous, 2014.
+# Pablo Foche <EMAIL@ADDRESS>, 2012-2013.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2014-08-03 18:13+0000\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:38+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "language/eo/)\n"
 "Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -84,15 +85,14 @@ msgstr "Publikig-notoj"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
-#, fuzzy
 msgid ""
 "Important information are given about this release of <application>Mageia</"
 "application> and are accessible clicking on the <guibutton>Release Notes</"
 "guibutton> button."
 msgstr ""
 "Por vidi kio estas nova en ĉi tiu versio de <application>Magejo</"
-"application>, klaku sur la butono <guibutton>Publikig-notoj (Release Notes)  "
-"</guibutton>."
+"application>, klaku sur la butono <guibutton>Publikig-notoj (Release Notes)<"
+"/guibutton>."
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakLive-cover.xml:2 en/DrakLive.xml:1
@@ -105,9 +105,9 @@ msgstr "eo"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selekto de datumportilo (Konfiguru aldonaj instal-datumportiloj)"
 
-#.  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 ""
@@ -164,31 +164,31 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Uzula kaj superuzula administrado"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
-#, fuzzy
 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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -273,7 +273,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
-#, fuzzy
 msgid ""
 "<guilabel>Password</guilabel>: In this text box you should type in the user "
 "password. There is a shield at the end of the text box that indicates the "
@@ -281,7 +280,7 @@ msgid ""
 msgstr ""
 "<guilabel>Pasvorto</guilabel>: En ĉi tiu teksta skatolo vi devus tajpi la "
 "uzulan pasvorton. Estas kampo je la fino de la teksto-skatolo indikanta la "
-"forton de la pasvorto. (Vidu ankaŭ <xref linkend=\"givePassword\"></xref>)"
+"forton de la pasvorto. (Vidu ankaŭ <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
@@ -316,7 +315,6 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:106
-#, fuzzy
 msgid ""
 "If you don't want a world readable home directory for anyone, it is advised "
 "to only add a temporary user now and to add the real one(s)  after reboot."
@@ -347,14 +345,12 @@ msgstr "Sperta uzulo-administrado"
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:125
-#, fuzzy
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
 "screen that allows you to edit the settings for the user you are adding."
 msgstr ""
 "Se la <guibutton>Progresinta</guibutton> butono estas klakita aperos ekrano "
-"ebliganta eldoni la konfiguron de la aldonata uzulo.  Krome, vi povas "
-"aktivigi aŭ malaktivigi gastan konton."
+"ebliganta eldoni la konfiguron de la aldonata uzulo."
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:129
@@ -422,20 +418,19 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Elekti surmetingojn"
 
-#.  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 
+#.  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 
+#.        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 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -444,9 +439,12 @@ msgid ""
 "png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
 "im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" width=\"100%\" format=\"PNG\" depth=\"600\" xml:id="
-"\"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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -541,14 +539,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" width="
-"\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"acceptLicense-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -617,11 +613,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -709,14 +703,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" width="
-"\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"acceptLicense-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -903,8 +895,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfiguru viajn Servojn"
 
-#.  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 ""
@@ -955,11 +947,10 @@ msgstr "Ŝanĝu aferojn nur se vi scias tre bone kion vi estas faranta."
 msgid "Configure your Timezone"
 msgstr "Konfiguru vian horzonon"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -967,9 +958,11 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </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
@@ -1319,7 +1312,6 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/diskdrake.xml:41
-#, fuzzy
 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 "
@@ -1375,12 +1367,10 @@ msgstr ""
 
 #. type: Content of: <section><note><para><mediaobject>
 #: en/diskdrake.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-diskdrake2.png\"/> </imageobject>"
 
 #. type: Content of: <section><figure>
 #: en/diskdrake.xml:68 en/installer.xml:41
@@ -1413,13 +1403,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/doPartitionDisks.xml:20
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
 "\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx2-doPartitionDisks.png"
+"\"/> </imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:27
@@ -1502,13 +1491,12 @@ msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><mediaobject>
 #: en/doPartitionDisks.xml:71
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:78
@@ -1754,9 +1742,9 @@ msgstr ""
 msgid "Congratulations"
 msgstr "Gratulon"
 
-#.  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
@@ -1815,13 +1803,12 @@ msgstr ""
 msgid "Formatting"
 msgstr "Strukturi subdiskojn"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1830,9 +1817,12 @@ msgid ""
 "png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
 "</imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"width=\"800\" depth=\"600\" format=\"PNG\" align=\"center\" xml:id="
-"\"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>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
@@ -1930,13 +1920,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome2.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:54
@@ -1953,13 +1942,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:66
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
 "</imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:71
@@ -1977,13 +1965,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:82
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome4fr.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:91
@@ -1992,13 +1979,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:95
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcome5def.png\" align=\"center\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:102
@@ -2059,13 +2045,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:133
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcome6opt.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:140
@@ -2082,13 +2067,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:150
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
 "</imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx-welcomeHelp1.png\" align=\"center\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:157
@@ -2101,13 +2085,12 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:163
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
 "</imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-selectKeyboard.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"dx-welcomeHelp2.png\"/> "
+"</imageobject>"
 
 #. type: Content of: <section><itemizedlist><listitem><note><para>
 #: en/installer.xml:171
@@ -2291,10 +2274,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Ĝisdatigoj"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2338,14 +2321,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\" /> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2368,8 +2349,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2377,9 +2358,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2506,18 +2487,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Diversaj parametroj"
 
-#.  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" 
+#. 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
@@ -2826,14 +2807,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" width="
-"\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"acceptLicense-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -2869,8 +2848,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Sekurec-nivelo"
 
-#.  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 ""
@@ -3263,11 +3242,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:335
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/SelectAndUseISOs2.xml:345
@@ -3389,11 +3365,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:413
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:420
@@ -3409,11 +3382,8 @@ msgstr ""
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:429
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:434
@@ -3429,16 +3399,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3488,8 +3463,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Elektu vian Landon / Regionon"
 
-#.  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 ""
@@ -3661,14 +3636,13 @@ msgstr "Klavaro"
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboardLive.xml:7
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-summaryBottom.png\" "
-"align=\"center\" format=\"PNG\" xml:id=\"summary-im2\"></imagedata> </"
+"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><para>
@@ -3783,15 +3757,15 @@ 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 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\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
@@ -3821,35 +3795,33 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:54
-#, fuzzy
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
 "installed languages."
 msgstr ""
-"Magejo uzas UTF-8 (Unikodon) defaŭlte. Ĉi tio povas esti malŝaltita en la "
+"Ĉi tio povas esti malŝaltita en la "
 "plurlingva ekrano se vi certas pri tio ke ĝi estas neadekvata por via "
 "lingvo. Malŝalti unikodon havos konsekvencojn sur ĉiuj instalitaj lingvoj."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:60
-#, fuzzy
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
 msgstr ""
 "Vi povas ŝanĝi la lingvon de via sistemo post la instalo per la Kontrolilo "
-"de Magejo -&gt; Sistemo -&gt; Agordi skrib-sistemojn."
+"de Magejo -> Sistemo -> Agordi skrib-sistemojn."
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 msgid "Select mouse"
 msgstr "Selekti muson"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3894,7 +3866,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3903,9 +3874,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3931,15 +3905,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"setupBootloaderAddEntry.png\" format=\"PNG\" align=\"center\" xml:id="
-"\"setupBootloaderAddEntry-im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -3992,13 +3965,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:7
@@ -4007,7 +3979,6 @@ msgstr "Lanĉilaj ĉefaj elektoj"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4015,9 +3986,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4041,7 +4014,6 @@ msgstr ""
 
 #. type: Content of: <section><section><tip><para>
 #: en/setupBootloader.xml:32
-#, fuzzy
 msgid "The Mageia graphical menus are nice :"
 msgstr "La grafika menuo de Magejo estas bela :)"
 
@@ -4052,7 +4024,6 @@ msgstr "Uzi la lanĉilon de Magejo"
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:41
-#, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
 "(Master Boot Record)  of your first hard drive. If you already have other "
@@ -4074,7 +4045,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/setupBootloader.xml:51
-#, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
@@ -4112,7 +4082,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:74
-#, fuzzy
 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 "
@@ -4180,15 +4149,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4212,14 +4180,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Konfiguri SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4259,7 +4227,7 @@ msgstr "DrakX devus tiam esti kapabla konfiguri la aparato(j)n ĝuste."
 msgid "Sound Configuration"
 msgstr ""
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4320,12 +4288,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  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 
+#.     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 ""
@@ -4362,11 +4330,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4438,13 +4404,12 @@ msgstr "La instal-paŝoj"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-diskdrake.png\" align=\"center\"></"
-"imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4517,14 +4482,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-license.png\" width="
-"\"800\" align=\"center\" format=\"PNG\" depth=\"600\" xml:id=\"acceptLicense-"
-"im1\"></imagedata> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -4537,13 +4500,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks.png\" align=\"center"
-"\"></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/es.po b/docs/installer/es.po
index 9be7fc8f..2f8cd924 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -1,36 +1,35 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2014
-# Miguel Ortega, 2013-2015
-# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014-2015
-# Fernando J. E. Aren <phy.tester@gmail.com>, 2014
-# Francisco B.G. <franchulo021@gmail.com>, 2016
-# jdru_drv <j.d.ramirez.u@gmail.com>, 2014
-# jdru_drv <j.d.ramirez.u@gmail.com>, 2014
-# Jose Manuel López <joselp@outlook.es>, 2016
-# Jose Manuel López <joselp@outlook.es>, 2014-2015
-# Miguel Ortega, 2013
-# Miguel Ortega, 2016
-# tortuleon <rodrigo.prieto@ymail.com>, 2014
-# seacat <seacat.linux@gmail.com>, 2016
-# tortuleon <rodrigo.prieto@ymail.com>, 2014
+# Adolfo Jayme Barrientos <fitoschido@ubuntu.com>, 2014.
+# Miguel Ortega, 2013-2015.
+# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014-2015.
+# Fernando J. E. Aren <phy.tester@gmail.com>, 2014.
+# Francisco B.G. <franchulo021@gmail.com>, 2016.
+# jdru_drv <j.d.ramirez.u@gmail.com>, 2014.
+# Jose Manuel López <joselp@outlook.es>, 2016.
+# Jose Manuel López <joselp@outlook.es>, 2014-2015.
+# Miguel Ortega, 2013.
+# Miguel Ortega, 2016.
+# tortuleon <rodrigo.prieto@ymail.com>, 2014.
+# seacat <seacat.linux@gmail.com>, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-05-07 21:54+0000\n"
-"Last-Translator: seacat <seacat.linux@gmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:38+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -122,9 +121,9 @@ msgstr "es"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selección de Medios (Configurar Medios de Instalación Complementarios)"
 
-#.  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 ""
@@ -196,18 +195,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Administración de usuarios y del administrador"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -452,17 +451,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Elija los puntos de montaje"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -664,9 +663,9 @@ msgstr "En modo BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -775,13 +774,12 @@ msgstr "En modo UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -970,8 +968,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configure sus Servicios"
 
-#.  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 ""
@@ -1024,8 +1022,8 @@ msgstr "Sólo cambie servicios cuando sepa bien lo que está haciendo."
 msgid "Configure your Timezone"
 msgstr "Configure su huso horario"
 
-#.  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 ""
@@ -1884,9 +1882,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Felicitaciones"
 
-#.  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
@@ -1945,10 +1943,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formateo"
 
-#.  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 ""
@@ -2486,10 +2484,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Actualizaciones"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2532,13 +2530,12 @@ msgstr "Pantalla de inicio de sesión"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2563,10 +2560,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Puede encontrar otra parte de nuestra documentación en <link linkend="
 "\"https://wiki.mageia.org/en/Category:Documentation\">la wiki de Mageia</"
@@ -2577,9 +2573,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Selección de medio (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2734,18 +2730,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resumen de la Configuración"
 
-#.  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" 
+#. 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
@@ -3103,8 +3099,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Nivel de seguridad"
 
-#.  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 ""
@@ -3724,16 +3720,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3785,8 +3786,8 @@ msgstr "Desconecta tu pendrive USB, esta echo"
 msgid "Select your Country / Region"
 msgstr "Seleccione su país / Región"
 
-#.  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 ""
@@ -4147,10 +4148,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Elección del ratón"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4194,7 +4195,6 @@ msgstr "Agregando o modificando una entrada en el menú de arranque"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4203,9 +4203,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4238,15 +4241,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4321,7 +4323,6 @@ msgstr "Opciones principales del cargador de arranque"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4329,11 +4330,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4488,16 +4489,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4523,14 +4522,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Configurando SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4572,7 +4571,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Configurar el sonido"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4650,12 +4649,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirme el disco que va a formatear"
 
-#.  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 
+#.     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 ""
@@ -4902,13 +4901,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/et.po b/docs/installer/et.po
index aef4f475..51a37dcd 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the Mageia Installer package.
 #
 # Marek Laane <bald@smail.ee>, 2012, 2013, 2014, 2015, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-05-27 04:33+0300\n"
-"Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:39+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
@@ -105,9 +106,9 @@ msgstr "et"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Andmekandjate valik (täiendavate paigaldusandmekandjate seadistamine)"
 
-#.  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 ""
@@ -179,18 +180,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Kasutajate ja administraatori haldamine"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -434,17 +435,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Haakepunktide valimine"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -644,9 +645,9 @@ msgstr "BIOS-e/CSM-i/Pärandrežiimis"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -749,13 +750,12 @@ msgstr "UEFI režiimis"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -947,8 +947,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Teenuste seadistamine"
 
-#.  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 ""
@@ -1002,8 +1002,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Ajavööndi seadistamine"
 
-#.  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 ""
@@ -1864,9 +1864,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Õnnitleme!"
 
-#.  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
@@ -1926,10 +1926,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Vormindamine"
 
-#.  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 ""
@@ -2457,10 +2457,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Uuendused"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2503,13 +2503,12 @@ msgstr "Sisselogimisekraan"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2534,10 +2533,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Rohkem teavet leiab <link linkend=\"https://wiki.mageia.org/en/Category:"
 "Documentation\">Mageia wikist</link>."
@@ -2547,9 +2545,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Andmekandjate valik (mittevaba tarkvara)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2699,18 +2697,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Seadistuste kokkuvõte"
 
-#.  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" 
+#. 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
@@ -3066,8 +3064,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Turbetase"
 
-#.  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 ""
@@ -3704,16 +3702,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3723,16 +3726,21 @@ 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"
@@ -3787,8 +3795,8 @@ msgstr "Eemaldage USB-pulk, kõik on valmis"
 msgid "Select your Country / Region"
 msgstr "Riigi / piirkonna valimine"
 
-#.  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 ""
@@ -4155,10 +4163,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Hiire valimine"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4200,7 +4208,6 @@ msgstr "Alglaadimismenüü kirje lisamine või muutmine"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4209,9 +4216,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4244,15 +4254,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4333,7 +4342,6 @@ msgstr "Alglaaduri põhiseadistused"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4341,11 +4349,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4508,16 +4516,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4550,14 +4556,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "SCSI seadistamine"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4597,7 +4603,7 @@ msgstr "Seejärel peaks DrakX olema võimeline kettad korrektselt seadistama."
 msgid "Sound Configuration"
 msgstr "Heli seadistamine"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4674,12 +4680,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Kõvaketta vormindamise kinnitamine"
 
-#.  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 
+#.     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 ""
@@ -4934,13 +4940,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index abf8305a..0fba8599 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -1,24 +1,25 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Egoitz Rodriguez Obieta <egoitzro2@hotmail.com>, 2014
-# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014-2016
+# Egoitz Rodriguez Obieta <egoitzro2@hotmail.com>, 2014.
+# Egoitz Rodriguez Obieta <egoitzro@gmail.com>, 2014-2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-07-02 08:39+0000\n"
-"Last-Translator: Egoitz Rodriguez Obieta <egoitzro@gmail.com>\n"
-"Language-Team: Basque (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:40+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "eu/)\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -106,9 +107,9 @@ msgstr "eu"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Baliabide Aukeraketa (Konfiguratu Instalazio Baliabide Osagarriak)"
 
-#.  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 ""
@@ -179,18 +180,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Erabiltzaile eta Supererabiltzaileen Kudeaketa"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -427,17 +428,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Aukeratu muntatze-puntuak"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -622,9 +623,9 @@ msgstr "BIOS/CSM/Legacy moduan"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -725,13 +726,12 @@ msgstr "UEFI moduan"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -917,8 +917,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfiguratu zure Zerbitzuak"
 
-#.  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 ""
@@ -971,8 +971,8 @@ msgstr "Gauza bakarra aldatzen duzunean, oso ondo dakizu zer egiten ari zaren."
 msgid "Configure your Timezone"
 msgstr "Konfiguratu zure Denbora-Eremua"
 
-#.  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 ""
@@ -1815,9 +1815,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Zorionak"
 
-#.  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
@@ -1878,10 +1878,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formateatzen"
 
-#.  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 ""
@@ -2414,10 +2414,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Eguneraketak"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2461,13 +2461,12 @@ msgstr "Sarrera pantaila"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2490,18 +2489,20 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
+"Aurki ditzakezu <link linkend=\"https://wiki.mageia.org/en/Category:Documentat"
+"ion\">hemen</link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr "Baliabide Aukeraketa (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2652,18 +2653,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Hainbat parametroen laburpena"
 
-#.  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" 
+#. 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
@@ -3020,8 +3021,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Segurtasun-maila"
 
-#.  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 ""
@@ -3637,16 +3638,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3700,8 +3706,8 @@ msgstr "Deskonektatu zure USB, eginda dago"
 msgid "Select your Country / Region"
 msgstr "Aukeratu zure Herrialdea / Eskualdea"
 
-#.  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 ""
@@ -4062,10 +4068,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Aukeratu sagua"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4110,7 +4116,6 @@ msgstr "Gegitu edo Aldatu Abio Menuko Sarrera"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4119,9 +4124,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4154,15 +4162,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4234,7 +4241,6 @@ msgstr "Abio kargatzailearen aukera nagusiak"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4242,11 +4248,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4396,16 +4402,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4429,14 +4433,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "SCSI konfiguratu"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4477,7 +4481,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Soinu Konfiguraketa"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4554,12 +4558,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Baieztatzeko formateatu beharreko disko gogorra"
 
-#.  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 
+#.     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 ""
@@ -4794,13 +4798,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 8a93ebca..a52c9d96 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -1,36 +1,35 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Rémi Verschelde <akien@mageia.org>, 2014
-# Antoine Dumondel, 2015
-# Antoine Dumondel, 2015
-# Charles Monzat <superboa@hotmail.fr>, 2016
-# Eric Barbero <dune06@free.fr>, 2013
-# Eric Barbero <dune06@free.fr>, 2013-2016
-# Lebarhon <lebarhon@free.fr>, 2015
-# Lebarhon <lebarhon@free.fr>, 2013
-# Lebarhon <lebarhon@free.fr>, 2013,2015
-# papoteur, 2013
-# Rémi Verschelde <akien@mageia.org>, 2014
-# Samir Mdr <t411samir2@gmail.com>, 2016
-# Yves Brungard, 2013,2015
-# Yves Brungard, 2013,2015-2016
+# Rémi Verschelde <akien@mageia.org>, 2014.
+# Antoine Dumondel, 2015.
+# Charles Monzat <superboa@hotmail.fr>, 2016.
+# Eric Barbero <dune06@free.fr>, 2013.
+# Eric Barbero <dune06@free.fr>, 2013-2016.
+# Lebarhon <lebarhon@free.fr>, 2015.
+# Lebarhon <lebarhon@free.fr>, 2013.
+# Lebarhon <lebarhon@free.fr>, 2013,2015.
+# papoteur, 2013.
+# Samir Mdr <t411samir2@gmail.com>, 2016.
+# Yves Brungard, 2013,2015.
+# Yves Brungard, 2013,2015-2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-20 10:24+0000\n"
-"Last-Translator: Charles Monzat <superboa@hotmail.fr>\n"
-"Language-Team: French (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:40+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "fr/)\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -123,9 +122,9 @@ msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Sélection de média (Configurer l'installation de média supplémentaires)"
 
-#.  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 ""
@@ -197,18 +196,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestion de l'Utilisateur et du Superutilisateur"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -456,17 +455,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Choix des points de montage"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -672,9 +671,9 @@ msgstr "Dans le mode Bios, csm ou legacy"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -784,13 +783,12 @@ msgstr "En mode UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -989,8 +987,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configurer les Services"
 
-#.  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 ""
@@ -1043,8 +1041,8 @@ msgstr "Ne modifier quelque chose qu'avec la certitude de bien faire."
 msgid "Configure your Timezone"
 msgstr "Configurer le fuseau horaire"
 
-#.  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 ""
@@ -1922,9 +1920,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Félicitations"
 
-#.  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
@@ -1986,10 +1984,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatage"
 
-#.  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 ""
@@ -2541,10 +2539,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Mises à jour"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2588,13 +2586,12 @@ msgstr "Ecran de connexion"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2620,10 +2617,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Vous pouvez trouver une autre partie de notre documentation dans <link "
 "linkend=\"https://wiki.mageia.org/en/Documentation-fr\">le wiki Mageia</"
@@ -2634,9 +2630,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Sélection des média (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2792,18 +2788,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Résumé des différents paramètres"
 
-#.  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" 
+#. 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
@@ -3169,8 +3165,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Niveau de Sécurité"
 
-#.  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 ""
@@ -3820,16 +3816,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3839,16 +3840,21 @@ 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"
@@ -3904,8 +3910,8 @@ msgstr "Débranchez votre clé USB, c'est terminé."
 msgid "Select your Country / Region"
 msgstr "Sélection du Pays / Région"
 
-#.  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 ""
@@ -4286,10 +4292,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Sélection de la souris"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4335,7 +4341,6 @@ msgstr "Ajouter ou Modifier une Entrée de Menu de Démarrage"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4344,9 +4349,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4381,15 +4389,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4473,7 +4480,6 @@ msgstr "Principales options du chargeur de démarrage"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4481,11 +4487,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4652,16 +4658,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4695,14 +4699,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Configuration du SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4743,7 +4747,7 @@ msgstr "DrakX pourra alors les configurer correctement."
 msgid "Sound Configuration"
 msgstr "Configuration du son"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4821,12 +4825,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmer le disque dur à formater"
 
-#.  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 
+#.     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 ""
@@ -5085,13 +5089,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index 8b1943ec..6682287c 100644
--- a/docs/installer/help.pot
+++ b/docs/installer/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help 3.0\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2005,8 +2005,8 @@ msgstr ""
 #: en/login.xml:3
 msgid ""
 "You can find another part of our documentation in <link "
-"xmlns:ns0=\"http://www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the "
-"Mageia wiki</link>."
+"linkend=\"https://wiki.mageia.org/en/Category:Documentation\">the Mageia "
+"wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
diff --git a/docs/installer/hr.po b/docs/installer/hr.po
index 476e44df..079fd34e 100644
--- a/docs/installer/hr.po
+++ b/docs/installer/hr.po
@@ -1,19 +1,18 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Ivica  Kolić <ikoli@yahoo.com>, 2014-2015
-# Romero, 2015
-# Romero, 2015
+# Ivica  Kolić <ikoli@yahoo.com>, 2014-2015.
+# Romero, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\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/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:41+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "language/hr/)\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -86,7 +86,6 @@ msgstr "Bilješke o izdanju"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
-#, fuzzy
 msgid ""
 "Important information are given about this release of <application>Mageia</"
 "application> and are accessible clicking on the <guibutton>Release Notes</"
@@ -106,9 +105,9 @@ msgstr "hr"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Odabir Medija (Konfiguracija dopunskog instalacijskog medija)"
 
-#.  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 ""
@@ -172,31 +171,31 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Upravljanje korisnikom i superkorisnikom"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
-#, fuzzy
 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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -279,7 +278,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
-#, fuzzy
 msgid ""
 "<guilabel>Password</guilabel>: In this text box you should type in the user "
 "password. There is a shield at the end of the text box that indicates the "
@@ -287,7 +285,7 @@ msgid ""
 msgstr ""
 "<guilabel>Lozinka</guilabel>: U tekstualno polje trebate uppisati korisničku "
 "lozinku. Na kraju tekstualnog polja nalazi se štit koji pokazuje snagu "
-"lozinke.(Također vidi <xref linkend=\"givePassword\"></xref>)"
+"lozinke.(Također vidi <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
@@ -344,14 +342,12 @@ msgstr "Napredno korisničko upravljanje"
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:125
-#, fuzzy
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
 "screen that allows you to edit the settings for the user you are adding."
 msgstr ""
 "Ako je  kliknuto na <guibutton>napredno</guibutton> dugme nudi vam se zaslon "
-"gdje možete urediti postavke korisnika kojega dodajete. Dodatno, možete "
-"onemogućiti ili omogućiti račun gosta."
+"gdje možete urediti postavke korisnika kojega dodajete."
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:129
@@ -406,20 +402,19 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Odaberite mjesta montiranja"
 
-#.  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 
+#.  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 
+#.        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 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -428,9 +423,12 @@ msgid ""
 "png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
 "im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -523,13 +521,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -598,11 +595,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -690,13 +685,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -862,8 +856,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfigurirajte vaše servise"
 
-#.  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 ""
@@ -913,11 +907,10 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Konfigurirajte vremensku zonu"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -925,9 +918,11 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </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
@@ -1538,15 +1533,13 @@ msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
 #: en/DrakLive-cover.xml:10
-#, fuzzy
 msgid "January 2015"
-msgstr "Veljača 2014"
+msgstr "Veljača 2015"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
 #: en/DrakLive-cover.xml:11
-#, fuzzy
 msgid "Mageia 5"
-msgstr "Mageia 4"
+msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
 #: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
@@ -1626,9 +1619,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Čestitamo"
 
-#.  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
@@ -1679,10 +1672,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatiram"
 
-#.  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 ""
@@ -2092,10 +2085,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Nadogradnje"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2131,14 +2124,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2161,8 +2152,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2170,9 +2161,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2285,18 +2276,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  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" 
+#. 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
@@ -2564,13 +2555,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -2601,8 +2591,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Sigurnosna Razina"
 
-#.  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 ""
@@ -3147,16 +3137,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3206,8 +3201,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  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 ""
@@ -3342,14 +3337,14 @@ msgstr "Tipkovnica"
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboardLive.xml:7
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
@@ -3438,15 +3433,16 @@ 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 fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
@@ -3488,10 +3484,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr ""
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3527,7 +3523,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3536,9 +3531,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3564,14 +3562,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -3624,13 +3622,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:7
@@ -3639,7 +3636,6 @@ msgstr "Glavne postavke bootloadera"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -3647,9 +3643,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -3775,14 +3773,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -3806,14 +3804,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr ""
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -3846,7 +3844,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Konfiguracija zvuka"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -3905,12 +3903,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  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 
+#.     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 ""
@@ -3947,11 +3945,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4022,13 +4018,12 @@ msgstr ""
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4101,13 +4096,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -4120,13 +4114,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-chooseDesktop.png\" align=\"center\" "
-"format=\"PNG\" ></imagedata> </imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/id.po b/docs/installer/id.po
index 7a28ff3a..f03f1203 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -1,26 +1,26 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Kiki <kiki.syahadat@yahoo.co.id>, 2013,2015
-# Kiki <kiki.syahadat@yahoo.co.id>, 2013
-# Kiki <kiki.syahadat@yahoo.co.id>, 2013-2014
-# Yuri Chornoivan <yurchor@ukr.net>, 2013
+# Kiki <kiki.syahadat@yahoo.co.id>, 2013,2015.
+# Kiki <kiki.syahadat@yahoo.co.id>, 2013.
+# Kiki <kiki.syahadat@yahoo.co.id>, 2013-2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\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/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:45+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "language/id/)\n"
 "Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -86,7 +86,6 @@ msgstr "Catatan Rilis"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
-#, fuzzy
 msgid ""
 "Important information are given about this release of <application>Mageia</"
 "application> and are accessible clicking on the <guibutton>Release Notes</"
@@ -106,9 +105,9 @@ msgstr "id"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Pemilihan Media (Konfigurasi Media Instalasi Pelengkap)"
 
-#.  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 ""
@@ -179,31 +178,31 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Pengelolaan Pengguna dan Pengguna Super"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
-#, fuzzy
 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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -288,7 +287,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
-#, fuzzy
 msgid ""
 "<guilabel>Password</guilabel>: In this text box you should type in the user "
 "password. There is a shield at the end of the text box that indicates the "
@@ -296,7 +294,7 @@ msgid ""
 msgstr ""
 "<guilabel>Sandi</guilabel>: Pada kotak teks ini Anda perlu mengetikkan sandi "
 "pengguna. Terdapat pelindung pada ujung dari kotak teks yang menandakan "
-"kekuatan sandi. (Lihat juga <xref linkend=\"givePassword\"></xref>)"
+"kekuatan sandi. (Lihat juga <xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
@@ -331,7 +329,6 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:106
-#, fuzzy
 msgid ""
 "If you don't want a world readable home directory for anyone, it is advised "
 "to only add a temporary user now and to add the real one(s)  after reboot."
@@ -364,14 +361,13 @@ msgstr "Pengelolaan Pengguna Lanjutan"
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:125
-#, fuzzy
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
 "screen that allows you to edit the settings for the user you are adding."
 msgstr ""
 "Jika tombol <guibutton>lanjutan</guibutton> diklik, akan ditampilkan sebuah "
 "layar yang memungkinkan Anda mengedit pengaturan pengguna yang Anda "
-"tambahkan. Sebagai tambahan, Anda bisa mematikan atau menghidupkan akun tamu."
+"tambahkan."
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:129
@@ -440,20 +436,19 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Pilih titik kait"
 
-#.  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 
+#.  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 
+#.        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 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -462,9 +457,12 @@ msgid ""
 "png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
 "im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -559,13 +557,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -635,9 +632,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -725,13 +722,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -920,8 +916,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfigurasikan Layanan Anda"
 
-#.  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 ""
@@ -974,11 +970,10 @@ msgstr "Hanya ubah sesuatu jika Anda sangat mengetahui hal tersebut."
 msgid "Configure your Timezone"
 msgstr "Konfigurasi Zona Waktu Anda"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -986,9 +981,11 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </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
@@ -1552,7 +1549,6 @@ msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:64
-#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1720,15 +1716,13 @@ msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
 #: en/DrakLive-cover.xml:10
-#, fuzzy
 msgid "January 2015"
-msgstr "Februari 2014"
+msgstr "January 2015"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
 #: en/DrakLive-cover.xml:11
-#, fuzzy
 msgid "Mageia 5"
-msgstr "Mageia 4"
+msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
 #: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
@@ -1820,9 +1814,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Selamat"
 
-#.  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
@@ -1883,13 +1877,12 @@ msgstr ""
 msgid "Formatting"
 msgstr "Pemformatan"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1898,9 +1891,12 @@ msgid ""
 "png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
 "</imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
@@ -2417,10 +2413,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Update"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2464,13 +2460,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2492,10 +2487,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Informasi lebih lengkap ada di <link ns4:href=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">wiki Mageia</link>."
@@ -2505,9 +2499,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Pemilihan Media (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2653,18 +2647,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Ringkasan dari berbagai parameter"
 
-#.  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" 
+#. 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
@@ -2978,13 +2972,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -3020,8 +3013,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Tingkat Keamanan"
 
-#.  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 ""
@@ -3643,16 +3636,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3709,8 +3707,8 @@ msgstr "Lepas flashdisk, selesai"
 msgid "Select your Country / Region"
 msgstr "Pilih Negara / Wilayah Anda"
 
-#.  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 ""
@@ -3893,14 +3891,14 @@ msgstr "Keyboard"
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboardLive.xml:7
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.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=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
@@ -4017,15 +4015,15 @@ 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 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\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
@@ -4055,35 +4053,33 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:54
-#, fuzzy
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
 "installed languages."
 msgstr ""
-"Mageia menggunakan dukungan UTF-8 (Unicode) sebagai bawaan. Ini bisa "
-"dimatikan di layar \"banyak bahasa\" jika tidak sesuai dengan bahasa Anda. "
+"Ini bisa dimatikan di layar \"banyak bahasa\" jika tidak sesuai dengan bahasa "
+"Anda. "
 "Mematikan UTF-8 akan berpengaruh pada bahasa-bahasa yang diinstall."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:60
-#, fuzzy
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
 msgstr ""
 "Anda bisa mengubah bahasa komputer Anda setelah instalasi selesai di Pusat "
-"Kendali Mageia  -&gt; Sistem -&gt; Kelola lokalisasi untuk sistem Anda."
+"Kendali Mageia -> Sistem -> Kelola lokalisasi untuk sistem Anda."
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 msgid "Select mouse"
 msgstr "Pilih mouse"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4128,7 +4124,6 @@ msgstr "Tambah atau Modifikasi Entri Menu Boot"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4137,9 +4132,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4159,30 +4157,28 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/setupBootloaderAddEntry.xml:26
-#, fuzzy
 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 ""
-"Jika Anda telah memilih <code>Grub 2</code> sebagai bootloader, atau Grub2-"
-"efi untuk sistem UEFI, Anda tidak bisa menggunakan alat ini untuk mengedit "
+"Jika Anda telah memilih <code>Grub 2</code> sebagai bootloader Anda tidak "
+"bisa menggunakan alat ini untuk mengedit "
 "daftar pada langkah ini, tekan 'Berikutnya'. Anda perlu mengedit secara "
 "manual <code>/boot/grub2/custom.cfg</code> atau menggunakan <code>grub-"
 "customizer</code> saja."
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4249,12 +4245,11 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><info><title>
@@ -4264,7 +4259,6 @@ msgstr "Pilihan utama Bootloader"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4272,9 +4266,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4298,9 +4294,8 @@ msgstr ""
 
 #. type: Content of: <section><section><tip><para>
 #: en/setupBootloader.xml:32
-#, fuzzy
 msgid "The Mageia graphical menus are nice :"
-msgstr "Menu grafis Mageia sangat cantik :)"
+msgstr "Menu grafis Mageia sangat cantik :"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/setupBootloader.xml:37
@@ -4309,7 +4304,6 @@ msgstr "Gunakan bootloader Mageia"
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:41
-#, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
 "(Master Boot Record)  of your first hard drive. If you already have other "
@@ -4332,7 +4326,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/setupBootloader.xml:51
-#, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
@@ -4370,7 +4363,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:74
-#, fuzzy
 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 "
@@ -4443,15 +4435,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4475,14 +4466,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Pengaturan SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4522,7 +4513,7 @@ msgstr "DrakX lalu akan bisa mengkonfigurasi perangkat yang tepat."
 msgid "Sound Configuration"
 msgstr "Konfigurasi Suara"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4599,12 +4590,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Konfirmasi harddisk yang akan diformat"
 
-#.  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 
+#.     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 ""
@@ -4647,9 +4638,9 @@ msgstr "Media live"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4721,11 +4712,12 @@ msgstr "Instalasi Mageia"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4820,13 +4812,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -4839,11 +4830,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/it.po b/docs/installer/it.po
index aeee0aae..c15d432b 100644
--- a/docs/installer/it.po
+++ b/docs/installer/it.po
@@ -1,34 +1,31 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Federica <24fede89@gmail.com>, 2014
-# Federica <24fede89@gmail.com>, 2014
-# Federico <federico.paletta88@gmail.com>, 2014
-# ghina90 <inactive+ghina90@transifex.com>, 2014
-# ghina90 <inactive+ghina90@transifex.com>, 2014
-# Guybrush88 <erpizzo@alice.it>, 2014-2015
-# _pmat_ <matteo.pasotti@gmail.com>, 2015
-# _pmat_ <matteo.pasotti@gmail.com>, 2015
-# Roberto91 <robh91@hotmail.it>, 2014
-# Roberto Albano <randyichinose@gmail.com>, 2015
-# Roberto91 <robh91@hotmail.it>, 2014
-# Simona Busalacchi <simobusalacchi.sb@gmail.com>, 2016
+# Federica <24fede89@gmail.com>, 2014.
+# Federico <federico.paletta88@gmail.com>, 2014.
+# ghina90 <inactive+ghina90@transifex.com>, 2014.
+# Guybrush88 <erpizzo@alice.it>, 2014-2015.
+# _pmat_ <matteo.pasotti@gmail.com>, 2015.
+# Roberto91 <robh91@hotmail.it>, 2014.
+# Roberto Albano <randyichinose@gmail.com>, 2015.
+# Simona Busalacchi <simobusalacchi.sb@gmail.com>, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-25 10:30+0000\n"
-"Last-Translator: Simona Busalacchi <simobusalacchi.sb@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:45+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "it/)\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -114,9 +111,9 @@ msgstr "it"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selezione dei Media (Configura Media di Installazione Supplementari)"
 
-#.  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 ""
@@ -181,18 +178,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestione dell'utente e del superuser"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -394,17 +391,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Scegli i punti di mount"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -564,9 +561,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -654,14 +651,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
-"bootloaderConfiguration.png\" align=\"center\" format=\"PNG\" xml:id="
-"\"bootloaderConfiguration-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -823,8 +818,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configura i tuoi servizi"
 
-#.  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 ""
@@ -873,8 +868,8 @@ msgstr "Cambia le cose solo quando sai veramente bene cosa stai facendo."
 msgid "Configure your Timezone"
 msgstr "Configura il tuo fuso orario"
 
-#.  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 ""
@@ -1621,9 +1616,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Complimenti"
 
-#.  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
@@ -1680,10 +1675,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formattazione in corso"
 
-#.  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 ""
@@ -2144,10 +2139,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Aggiornamenti"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2186,13 +2181,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx-welcome-lang.png\" align=\"center\"/> "
-"</imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2215,18 +2209,21 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
+"Puoi trovarli <link linkend=\"https://wiki.mageia.org/en/Category:Documentatio"
+"n\">qui</"
+"link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr "Selezione media (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2345,18 +2342,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Sommario di vari parametri"
 
-#.  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" 
+#. 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
@@ -2702,8 +2699,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Livello di sicurezza"
 
-#.  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 ""
@@ -3314,16 +3311,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3377,8 +3379,8 @@ msgstr "Togli la tua chiavetta USB, hai concluso"
 msgid "Select your Country / Region"
 msgstr "Seleziona il tuo paese/regione"
 
-#.  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 ""
@@ -3706,10 +3708,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Seleziona il mouse"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3787,15 +3789,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4003,15 +4004,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4035,14 +4035,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Installa SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4083,7 +4083,7 @@ msgstr "DrakX dovrebbe essere in grado di configurare il drive correttamente."
 msgid "Sound Configuration"
 msgstr "Configurazione audio"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4144,12 +4144,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Conferma l'hard disk per essere formattato."
 
-#.  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 
+#.     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 ""
@@ -4362,11 +4362,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
@@ -4374,3 +4375,4 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
diff --git a/docs/installer/ja.po b/docs/installer/ja.po
index 84522343..e3991789 100644
--- a/docs/installer/ja.po
+++ b/docs/installer/ja.po
@@ -1,23 +1,24 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# ook rio <riokoko5@gmail.com>, 2016
+# ook rio <riokoko5@gmail.com>, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-27 16:17+0000\n"
-"Last-Translator: ook rio <riokoko5@gmail.com>\n"
-"Language-Team: Japanese (http://www.transifex.com/MageiaLinux/mageia/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:51+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "language/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -98,9 +99,9 @@ msgstr "ja"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 
-#.  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 ""
@@ -108,6 +109,9 @@ msgid ""
 "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
@@ -154,18 +158,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr ""
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -175,6 +179,10 @@ msgid ""
 "\" 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\" "
+"fileref=\"live-user1.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -349,17 +357,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "マウントポイントを選択"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -370,6 +378,12 @@ msgid ""
 "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 "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-chooseMountpoints."
+"png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
+"im1\"></imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -445,6 +459,8 @@ msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -515,6 +531,7 @@ msgstr ""
 #: en/bootLive.xml:12
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -606,6 +623,8 @@ msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -661,6 +680,8 @@ 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>"
 
 #. type: Content of: <section><para>
 #: en/chooseDesktop.xml:26
@@ -686,6 +707,8 @@ 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>"
 
 #. type: Content of: <section><para>
 #: en/choosePackageGroups.xml:16
@@ -737,6 +760,8 @@ 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>"
 
 #. type: Content of: <section><para>
 #: en/choosePackagesTree.xml:17
@@ -759,8 +784,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr ""
 
-#.  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 ""
@@ -768,6 +793,9 @@ msgid ""
 "\" 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
@@ -804,8 +832,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr ""
 
-#.  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 ""
@@ -815,6 +843,11 @@ msgid ""
 "<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>"
 
 #. type: Content of: <section><para>
 #: en/configureTimezoneUTC.xml:20
@@ -849,6 +882,9 @@ msgid ""
 "\"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
@@ -930,6 +966,9 @@ msgid ""
 "\" 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
@@ -1022,6 +1061,9 @@ msgid ""
 "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
@@ -1107,6 +1149,9 @@ msgid ""
 "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 "
+"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/diskdrake.xml:34
@@ -1168,11 +1213,12 @@ msgstr ""
 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
 msgid "<placeholder type=\"mediaobject\" id=\"0\"/>"
-msgstr ""
+msgstr "<placeholder type=\"mediaobject\" id=\"0\"/>"
 
 #. type: Content of: <section><info><title>
 #: en/doPartitionDisks.xml:7
@@ -1200,6 +1246,8 @@ msgid ""
 "<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
@@ -1271,6 +1319,8 @@ msgid ""
 "<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
@@ -1420,7 +1470,7 @@ msgstr ""
 #. type: Content of: <book><info><cover><mediaobject>
 #: en/DrakLive-cover.xml:17 en/DrakX-cover.xml:17
 msgid "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"mageia-2013.png\"/> </imageobject>"
 
 #. type: Content of: <article><info><cover><para>
 #: en/DrakLive-cover.xml:21 en/DrakLive.xml:12 en/DrakX-cover.xml:21
@@ -1490,9 +1540,9 @@ msgstr ""
 msgid "Congratulations"
 msgstr "おめでとうございます"
 
-#.  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
@@ -1501,6 +1551,9 @@ msgid ""
 "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
@@ -1541,10 +1594,10 @@ msgstr ""
 msgid "Formatting"
 msgstr ""
 
-#.  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 ""
@@ -1555,6 +1608,12 @@ msgid ""
 "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 "
+"condition='live'> <imagedata revision=\"1\" fileref=\"live-formatPartitions."
+"png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
+"</imagedata> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
@@ -1634,6 +1693,8 @@ msgid ""
 "<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata xml:id=\"BId-drakx-intro-im1\" revision=\"1\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-welcome.png\"/> </imageobject>"
 
 #. type: Content of: <section><mediaobject>
 #: en/installer.xml:49
@@ -1641,6 +1702,8 @@ msgid ""
 "<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
@@ -1661,6 +1724,8 @@ msgid ""
 "<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
@@ -1682,6 +1747,8 @@ msgid ""
 "<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
@@ -1694,6 +1761,8 @@ msgid ""
 "<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
@@ -1758,6 +1827,8 @@ msgid ""
 "<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
@@ -1778,6 +1849,8 @@ msgid ""
 "<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
@@ -1794,6 +1867,8 @@ msgid ""
 "<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
@@ -1835,6 +1910,8 @@ msgid ""
 "<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
 "\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
+"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><info><title>
 #: en/installer.xml:200
@@ -1952,10 +2029,10 @@ msgstr ""
 msgid "Updates"
 msgstr "更新"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -1963,6 +2040,9 @@ msgid ""
 "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
@@ -1995,6 +2075,8 @@ msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2017,8 +2099,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2026,9 +2108,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2037,6 +2119,9 @@ msgid ""
 "\" 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
@@ -2135,24 +2220,27 @@ msgid ""
 "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 ""
 
-#.  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" 
+#. 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
@@ -2160,6 +2248,8 @@ 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>"
 
 #. type: Content of: <section><para>
 #: en/misc-params.xml:38
@@ -2320,6 +2410,8 @@ 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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/misc-params.xml:156
@@ -2424,6 +2516,8 @@ msgid ""
 "<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>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -2454,8 +2548,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "セキュリティレベル"
 
-#.  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 ""
@@ -2463,6 +2557,9 @@ msgid ""
 "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
@@ -2780,7 +2877,7 @@ msgstr ""
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:294
 msgid "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:299
@@ -2793,7 +2890,7 @@ msgstr ""
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:304
 msgid "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:309
@@ -2844,7 +2941,7 @@ msgstr ""
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:335
 msgid "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"../Md5sum.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/SelectAndUseISOs2.xml:345
@@ -2967,7 +3064,7 @@ msgstr ""
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:413
 msgid "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:420
@@ -2984,7 +3081,7 @@ msgstr ""
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:429
 msgid "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
-msgstr ""
+msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:434
@@ -3000,16 +3097,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3059,8 +3161,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  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 ""
@@ -3068,6 +3170,9 @@ msgid ""
 "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
@@ -3130,6 +3235,8 @@ 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>"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectInstallClass.xml:32
@@ -3199,6 +3306,9 @@ msgid ""
 "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>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
@@ -3226,6 +3336,8 @@ msgid ""
 "<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
@@ -3293,6 +3405,10 @@ msgid ""
 "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 fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
@@ -3334,16 +3450,18 @@ msgstr ""
 msgid "Select mouse"
 msgstr ""
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  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>"
 
 #. type: Content of: <section><para>
 #: en/selectMouse.xml:23
@@ -3373,7 +3491,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3382,11 +3499,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3417,6 +3535,9 @@ msgid ""
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -3473,6 +3594,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:7
@@ -3481,7 +3604,6 @@ msgstr "ブートローダのメインオプション"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -3489,11 +3611,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -3619,17 +3741,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.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 fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -3653,20 +3772,22 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr ""
 
-#.  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 
+#.  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 
+#.        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>"
 
 #. type: Content of: <section><para>
 #: en/setupSCSI.xml:32
@@ -3693,13 +3814,15 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "サウンドの設定"
 
-#.  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>"
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:23
@@ -3752,12 +3875,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  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 
+#.     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 ""
@@ -3767,6 +3890,11 @@ msgid ""
 "takeOverHdConfirm.png\" format=\"PNG\" align=\"center\" ></imagedata> </"
 "imageobject>"
 msgstr ""
+"<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>"
 
 #. type: Content of: <section><para>
 #: en/takeOverHdConfirm.xml:27
@@ -3796,6 +3924,7 @@ msgstr ""
 #: en/testing.xml:18
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -3870,6 +3999,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -3946,6 +4077,8 @@ msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -3962,6 +4095,8 @@ msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
@@ -3969,3 +4104,4 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index 0ce19d67..03325a57 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -1,28 +1,27 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Dennis Holierhoek <dennis.hh@hotmail.com>, 2016
-# HanMi, 2014
-# HanMi, 2014
-# Marja van Waes <marja@mageia.org>, 2013,2015
-# Rodolfo_Jadon, 2014
-# Yuri Chornoivan <yurchor@ukr.net>, 2013
+# Dennis Holierhoek <dennis.hh@hotmail.com>, 2016.
+# HanMi, 2014.
+# Marja van Waes <marja@mageia.org>, 2013,2015.
+# Rodolfo_Jadon, 2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-07-06 15:31+0000\n"
-"Last-Translator: Dennis Holierhoek <dennis.hh@hotmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:51+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "nl/)\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -113,9 +112,9 @@ msgstr "nl"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Mediaselectie (Configureer aanvullende installatiebronnen)"
 
-#.  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 ""
@@ -186,18 +185,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gebruikersbeheer"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -443,17 +442,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Kies de koppelpunten"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -653,9 +652,9 @@ msgstr "In BIOS/CSM/Legacy-modus"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -752,13 +751,12 @@ msgstr "In UEFI-modus"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -947,8 +945,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configureer uw diensten"
 
-#.  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 ""
@@ -1001,8 +999,8 @@ msgstr "Verander alleen iets als u heel goed weet wat u doet."
 msgid "Configure your Timezone"
 msgstr "Configureer uw tijdzone"
 
-#.  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 ""
@@ -1863,9 +1861,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Gefeliciteerd"
 
-#.  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
@@ -1925,10 +1923,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatteren"
 
-#.  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 ""
@@ -2461,10 +2459,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Updates"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2508,13 +2506,12 @@ msgstr "Aanmeldscherm"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2536,10 +2533,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Meer documentatie vindt u in <link ns4:href=\"https://wiki.mageia.org/en/"
 "Documentation\">de Mageia wiki</link>."
@@ -2549,9 +2545,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Mediaselectie (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2706,18 +2702,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Overzicht van diverse instellingen"
 
-#.  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" 
+#. 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
@@ -3073,8 +3069,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Beveiligingsniveau"
 
-#.  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 ""
@@ -3699,16 +3695,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3764,8 +3765,8 @@ msgstr "Verwijder uw USB-stick, hij is gereed"
 msgid "Select your Country / Region"
 msgstr "Selecteer uw land"
 
-#.  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 ""
@@ -4133,10 +4134,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Muiskeuze"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4181,7 +4182,6 @@ msgstr "Wijzig een opstartmenu-ingang of voeg er een toe"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4190,9 +4190,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4226,15 +4229,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4314,7 +4316,6 @@ msgstr "Algemene opties voor de opstartlader"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4322,11 +4323,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4489,16 +4490,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4529,14 +4528,14 @@ msgstr "Wijzig het \"Opstartapparaat\" niet, tenzij u weet wat u doet."
 msgid "Setup SCSI"
 msgstr "Harde schijf detectie"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4575,7 +4574,7 @@ msgstr "DrakX zou deze dan goed moeten instellen."
 msgid "Sound Configuration"
 msgstr "Geluidsconfiguratie"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4651,12 +4650,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Bevestig het formatteren van de harde schijf"
 
-#.  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 
+#.     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 ""
@@ -4899,13 +4898,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 20a319be..84937a59 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -1,20 +1,19 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Daniel Krawczyk <daniekonepl@gmail.com>, 2014
-# Daniel Napora <napcok@gmail.com>, 2013,2015
-# mrzysko <m.rzysko@gmail.com>, 2014
-# mrzysko <m.rzysko@gmail.com>, 2014
+# Daniel Krawczyk <daniekonepl@gmail.com>, 2014.
+# Daniel Napora <napcok@gmail.com>, 2013,2015.
+# mrzysko <m.rzysko@gmail.com>, 2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2015-11-18 14:56+0000\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:53+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Polish (http://www.transifex.com/MageiaLinux/mageia/language/"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "pl/)\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
@@ -22,6 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -88,7 +88,6 @@ msgstr "Informacje o wydaniu"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
-#, fuzzy
 msgid ""
 "Important information are given about this release of <application>Mageia</"
 "application> and are accessible clicking on the <guibutton>Release Notes</"
@@ -108,9 +107,9 @@ msgstr "pl"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Wybór nośników (konfiguracja dodatkowych nośników instalacyjnych)"
 
-#.  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 ""
@@ -177,31 +176,31 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Zarządzanie użytkownikami"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
-#, fuzzy
 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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -284,7 +283,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
-#, fuzzy
 msgid ""
 "<guilabel>Password</guilabel>: In this text box you should type in the user "
 "password. There is a shield at the end of the text box that indicates the "
@@ -292,7 +290,7 @@ msgid ""
 msgstr ""
 "<guilabel>Hasło</guilabel>: W tym polu wpisz hasło użytkownika. Pojawi się w "
 "nim ikonka tarczy, która oznacza siłę hasła (Zobacz również <xref linkend="
-"\"givePassword\"></xref>)"
+"\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
@@ -327,7 +325,6 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:106
-#, fuzzy
 msgid ""
 "If you don't want a world readable home directory for anyone, it is advised "
 "to only add a temporary user now and to add the real one(s)  after reboot."
@@ -356,14 +353,12 @@ msgstr "Zaawansowane Zarządzanie Użytkownikami"
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:125
-#, fuzzy
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
 "screen that allows you to edit the settings for the user you are adding."
 msgstr ""
 "Po kliknięciu na przycisk <guibutton>Zaawansowane</guibutton> będziesz miał "
-"możliwość edycji ustawień dla użytkownika którego dodajesz. Dodatkowo, "
-"możesz aktywować lub deaktywować konto gościa."
+"możliwość edycji ustawień dla użytkownika którego dodajesz."
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:129
@@ -422,20 +417,19 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Wybierz punkty montowania"
 
-#.  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 
+#.  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 
+#.        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 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -444,9 +438,12 @@ msgid ""
 "png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
 "im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -539,13 +536,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -614,11 +610,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -706,13 +700,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -896,8 +889,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfiguracja usług"
 
-#.  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 ""
@@ -944,11 +937,10 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Konfiguruj strefę czasową"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -956,9 +948,11 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </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
@@ -1616,9 +1610,8 @@ msgstr ""
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
 #: en/DrakLive-cover.xml:11
-#, fuzzy
 msgid "Mageia 5"
-msgstr "Mageia 4"
+msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
 #: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
@@ -1710,9 +1703,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Gratulacje"
 
-#.  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
@@ -1769,13 +1762,12 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatowanie"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1784,9 +1776,12 @@ msgid ""
 "png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
 "</imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
@@ -2249,10 +2244,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Aktualizacje"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2296,14 +2291,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"PNG\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2326,8 +2319,8 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 
 #. type: Content of: <section><info><title>
@@ -2335,9 +2328,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Wybór nośników (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2477,18 +2470,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  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" 
+#. 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
@@ -2760,13 +2753,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -2797,8 +2789,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Poziom bezpieczeństwa"
 
-#.  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 ""
@@ -3346,16 +3338,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3405,8 +3402,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  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 ""
@@ -3567,14 +3564,14 @@ msgstr "Klawiatura"
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboardLive.xml:7
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
@@ -3683,15 +3680,15 @@ 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 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\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
@@ -3722,20 +3719,18 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:54
-#, fuzzy
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
 "installed languages."
 msgstr ""
-"Mageia używa domyślnie kodowania UTF-8 (Unikod). Jeśli wiesz, że to "
-"kodowanie nie jest odpowiednie dla twojego języka, możesz wyłączyć wsparcie "
+"Jeśli wiesz, że to kodowanie nie jest odpowiednie dla twojego języka, możesz "
+"wyłączyć wsparcie "
 "dla UTF-8 w oknie \"więcej języków\". Będzie to dotyczyć wszystkich "
 "zainstalowanych języków."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:60
-#, fuzzy
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
@@ -3748,10 +3743,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Wybierz mysz"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3789,7 +3784,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3798,9 +3792,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3826,14 +3823,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata xml:id=\"summaryBottom-im1\" revision=\"1\" align="
-"\"center\" format=\"PNG\" fileref=\"dx2-summaryBottom.png\" /> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -3886,13 +3883,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><info><title>
 #: en/setupBootloader.xml:7
@@ -3901,7 +3897,6 @@ msgstr "Podstawowe opcje programu rozruchowego"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -3909,9 +3904,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4037,15 +4034,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4069,14 +4065,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Wykrywanie SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4116,7 +4112,7 @@ msgstr "DrakX powinien być wtedy w stanie odpowiednio skonfigurować  dysk(i)."
 msgid "Sound Configuration"
 msgstr "Konfiguracja dźwięku"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4177,12 +4173,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Formatowanie twardego dysku"
 
-#.  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 
+#.     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 ""
@@ -4222,11 +4218,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4298,13 +4292,12 @@ msgstr "Etapy instalacji"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4377,13 +4370,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -4396,13 +4388,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-selectKeyboard.png"
-"\" /> </imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index f305e5e1..c8a061d8 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -1,28 +1,28 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Andre Arruda dos Santos Silva <kazzttor@gmail.com>, 2015
-# Marcio Andre Padula <padula1000@gmail.com>, 2013
-# Marcio Andre Padula <padula1000@gmail.com>, 2013-2016
-# Marcio Andre Padula <padula1000@gmail.com>, 2013
-# Paulo Henrique de Sousa <simbios.devs@gmail.com>, 2016
-# Rodrigo Piñero <rodrigo.pinero@yahoo.com.br>, 2016
+# Andre Arruda dos Santos Silva <kazzttor@gmail.com>, 2015.
+# Marcio Andre Padula <padula1000@gmail.com>, 2013.
+# Marcio Andre Padula <padula1000@gmail.com>, 2013-2016.
+# Paulo Henrique de Sousa <simbios.devs@gmail.com>, 2016.
+# Rodrigo Piñero <rodrigo.pinero@yahoo.com.br>, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-05-17 01:05+0000\n"
-"Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/MageiaLinux/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:53+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "mageia/language/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -112,9 +112,9 @@ msgstr "pt_BR"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Seleção de Mídia (Configurar a Instalação de Mídias Suplementares )"
 
-#.  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 ""
@@ -186,18 +186,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gerenciador de Usuário e Superusuário"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -446,17 +446,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Escolha os pontos de montagem"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -662,9 +662,9 @@ msgstr "No modo BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -772,13 +772,12 @@ msgstr "No modo UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -975,8 +974,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configurar os seus serviços"
 
-#.  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 ""
@@ -1030,8 +1029,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Configure o seu fuso horário"
 
-#.  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 ""
@@ -1899,9 +1898,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Parabéns"
 
-#.  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
@@ -1962,10 +1961,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatação"
 
-#.  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 ""
@@ -2505,10 +2504,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Atualizações"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2552,13 +2551,12 @@ msgstr "Tela de Login"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2583,10 +2581,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Você pode encontrar outra parte de nossa documentação em <link linkend="
 "\"https://wiki.mageia.org/en/Category:Documentation\">o wiki Mageia</link>."
@@ -2596,9 +2593,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Seleção de Mídia (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2755,18 +2752,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Resumo de diversos parâmetros"
 
-#.  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" 
+#. 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
@@ -3131,8 +3128,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Nível de Segurança"
 
-#.  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 ""
@@ -3773,16 +3770,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3792,16 +3794,21 @@ 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"
@@ -3856,8 +3863,8 @@ msgstr "Desligue o seu dispositivo USB, e pronto"
 msgid "Select your Country / Region"
 msgstr "Selecione seu país / região"
 
-#.  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 ""
@@ -4229,10 +4236,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Selecione o mouse"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4278,7 +4285,6 @@ msgstr "Adicionando ou Modificando uma Entrada do Menu de Inicialização"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4287,9 +4293,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4322,15 +4331,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4413,7 +4421,6 @@ msgstr "Principais Opções do Gerenciador de Inicialização"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4421,11 +4428,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4593,16 +4600,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4634,14 +4639,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Detecção de disco rígido"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4682,7 +4687,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Configuração de Som"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4760,12 +4765,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirme o disco rígido para ser formatado"
 
-#.  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 
+#.     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 ""
@@ -5021,13 +5026,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index e54f2c83..10ef7649 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -1,22 +1,20 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# corneliu.e <corneliueva@yahoo.com>, 2013
-# corneliu.e <corneliueva@yahoo.com>, 2013
-# Dan <djmarian4u@hotmail.com>, 2013
-# Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2013-2015
-# Dan <djmarian4u@hotmail.com>, 2013
-# Marja van Waes <marja@mageia.org>, 2015
+# corneliu.e <corneliueva@yahoo.com>, 2013.
+# Dan <djmarian4u@hotmail.com>, 2013.
+# Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>, 2013-2015.
+# Marja van Waes <marja@mageia.org>, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2015-06-14 14:35+0000\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:56+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "ro/)\n"
 "Language: ro\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +22,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -89,7 +88,6 @@ msgstr "Nota ediției"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
-#, fuzzy
 msgid ""
 "Important information are given about this release of <application>Mageia</"
 "application> and are accessible clicking on the <guibutton>Release Notes</"
@@ -109,9 +107,9 @@ msgstr "ro"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Selectare medii (configurați mediile de instalare suplimentare)"
 
-#.  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 ""
@@ -182,31 +180,31 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Gestionare utilizatori și administratori"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
-#, fuzzy
 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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -292,7 +290,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
-#, fuzzy
 msgid ""
 "<guilabel>Password</guilabel>: In this text box you should type in the user "
 "password. There is a shield at the end of the text box that indicates the "
@@ -300,7 +297,7 @@ msgid ""
 msgstr ""
 "<guilabel>Parolă</guilabel>: tastați aici parola utilizatorului. La capătul "
 "căsuței de dialog există un scut care indică puterea parolei. (Vedeți și "
-"<xref linkend=\"givePassword\"></xref>)"
+"<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
@@ -335,7 +332,6 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:106
-#, fuzzy
 msgid ""
 "If you don't want a world readable home directory for anyone, it is advised "
 "to only add a temporary user now and to add the real one(s)  after reboot."
@@ -368,14 +364,13 @@ msgstr "Gestionare avansată utilizatori"
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:125
-#, fuzzy
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
 "screen that allows you to edit the settings for the user you are adding."
 msgstr ""
 "Dacă apăsați butonul <guibutton>Avansat</guibutton> vi se va prezenta un "
 "ecran în care veți putea edita parametrii conturilor utilizatorilor pe care "
-"îi adăugați. Adițional, puteți dezactiva sau activa contul invitat."
+"îi adăugați."
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:129
@@ -444,20 +439,19 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Alegeți punctele de montare"
 
-#.  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 
+#.  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 
+#.        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 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -466,9 +460,12 @@ msgid ""
 "png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
 "im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -564,13 +561,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -640,9 +636,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -730,13 +726,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -924,8 +919,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Configurați serviciile"
 
-#.  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 ""
@@ -979,11 +974,10 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Configurați fusul orar"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -991,9 +985,11 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </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
@@ -1562,7 +1558,6 @@ msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:64
-#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1739,9 +1734,8 @@ msgstr "Februarie 2014"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
 #: en/DrakLive-cover.xml:11
-#, fuzzy
 msgid "Mageia 5"
-msgstr "Mageia 4"
+msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
 #: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
@@ -1834,9 +1828,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Felicitări"
 
-#.  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
@@ -1898,13 +1892,12 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatare în curs"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1913,9 +1906,12 @@ msgid ""
 "png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
 "</imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
@@ -2433,10 +2429,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Actualizări"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2480,13 +2476,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2508,10 +2503,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Informații suplimentare sînt disponibile pe <link ns4:href=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -2521,9 +2515,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Selectare medii (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2676,18 +2670,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Rezumatul parametrilor diverși"
 
-#.  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" 
+#. 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
@@ -3008,13 +3002,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -3050,8 +3043,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Nivel de securitate"
 
-#.  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 ""
@@ -3677,16 +3670,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3743,8 +3741,8 @@ msgstr "Deconectați cheia USB, ați terminat."
 msgid "Select your Country / Region"
 msgstr "Selectați țara / regiunea"
 
-#.  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 ""
@@ -3928,14 +3926,14 @@ msgstr "Tastatură"
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboardLive.xml:7
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.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=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
@@ -4054,15 +4052,15 @@ 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 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\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
@@ -4092,36 +4090,34 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:54
-#, fuzzy
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
 "installed languages."
 msgstr ""
-"Mageia utilizează UTF-8 (Unicode) în mod implicit. Acest lucru poate fi "
+"Acest lucru poate fi "
 "dezactivat în ecranul „multilingv” dacă știți că nu corespunde limbii "
 "dumneavoastră. Dezactivarea suportului UTF-8 se aplică tuturor limbilor "
 "instalate."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:60
-#, fuzzy
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
 msgstr ""
 "Puteți schimba limba sistemului și după instalare din Centrul de Control "
-"Mageia -&gt; Sistem -&gt; Gestionați localizarea sistemului."
+"Mageia -> Sistem -> Gestionați localizarea sistemului."
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 msgid "Select mouse"
 msgstr "Selectați mausul"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4166,7 +4162,6 @@ msgstr "Adăugați sau modificați o intrare din meniul de demaraj"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4175,9 +4170,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4198,30 +4196,28 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/setupBootloaderAddEntry.xml:26
-#, fuzzy
 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 ""
-"Dacă ați ales <code>Grub 2</code> ca încărcător de sistem, sau Grub2-efi "
-"pentru sistemele UEFI, nu puteți utiliza această unealtă pentru a edita "
+"Dacă ați ales <code>Grub 2</code> ca încărcător de sistem nu puteți utiliza "
+"această unealtă pentru a edita "
 "intrările în această etapă, apăsați „Înainte”. Va trebui să editați manual "
 "<code>/boot/grub2/custom.cfg</code> sau să utilizați <code>grub-customizer</"
 "code>."
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4251,7 +4247,6 @@ msgstr ""
 
 #. type: Content of: <section><section><warning><para>
 #: en/setupBootloaderAddEntry.xml:49
-#, fuzzy
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4289,12 +4284,11 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><info><title>
@@ -4304,7 +4298,6 @@ msgstr "Opțiunile principale ale încărcătorului de sistem"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4312,9 +4305,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4372,7 +4367,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/setupBootloader.xml:51
-#, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
@@ -4412,7 +4406,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:74
-#, fuzzy
 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 "
@@ -4487,15 +4480,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4519,14 +4511,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Configurare SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4566,7 +4558,7 @@ msgstr "DrakX va putea atunci să le configureze corect."
 msgid "Sound Configuration"
 msgstr "Configurare sunet"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4643,12 +4635,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Confirmați formatarea discului dur"
 
-#.  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 
+#.     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 ""
@@ -4690,9 +4682,9 @@ msgstr "Mediile Live"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4764,11 +4756,12 @@ msgstr "Instalarea Mageia"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4864,13 +4857,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -4883,11 +4875,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index bc6cf1e7..004a1da0 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -1,26 +1,23 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# AlexL <loginov.alex.valer@gmail.com>, 2013
-# angry_snake <inactive+angry_snake@transifex.com>, 2014
-# angry_snake <inactive+angry_snake@transifex.com>, 2014
-# Анатолий Валерианович <ffox909@mail.ru>, 2014
-# Marja van Waes <marja@mageia.org>, 2015
-# Valentin XliN Saikov <saikov.vb@gmail.com>, 2013
-# Valentin XliN Saikov <saikov.vb@gmail.com>, 2013-2015
-# Valentin XliN Saikov <saikov.vb@gmail.com>, 2015
-# Yuri Chornoivan <yurchor@ukr.net>, 2013
-# Анатолий Валерианович <ffox909@mail.ru>, 2014
+# AlexL <loginov.alex.valer@gmail.com>, 2013.
+# angry_snake <inactive+angry_snake@transifex.com>, 2014.
+# Анатолий Валерианович <ffox909@mail.ru>, 2014.
+# Marja van Waes <marja@mageia.org>, 2015.
+# Valentin XliN Saikov <saikov.vb@gmail.com>, 2013.
+# Valentin XliN Saikov <saikov.vb@gmail.com>, 2013-2015.
+# Valentin XliN Saikov <saikov.vb@gmail.com>, 2015.
+# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\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/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:59+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "ru/)\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
@@ -29,6 +26,7 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -95,7 +93,6 @@ msgstr "Заметки о выпуске"
 
 #. type: Content of: <section><section><para>
 #: en/acceptLicense.xml:70
-#, fuzzy
 msgid ""
 "Important information are given about this release of <application>Mageia</"
 "application> and are accessible clicking on the <guibutton>Release Notes</"
@@ -116,9 +113,9 @@ msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Выбор носителя (настройки дополнительных носителей пакетов для установки)"
 
-#.  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 ""
@@ -193,31 +190,31 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Управление учётными записями пользователя и администратора"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
-#, fuzzy
 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>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id="
-"\"configureX_card_list-im1\" fileref=\"dx2-configureX_card_list.png\" format="
-"\"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>"
 
 #. type: Content of: <section><section><info><title>
 #: en/addUser.xml:39
@@ -302,7 +299,6 @@ msgstr ""
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:86
-#, fuzzy
 msgid ""
 "<guilabel>Password</guilabel>: In this text box you should type in the user "
 "password. There is a shield at the end of the text box that indicates the "
@@ -310,7 +306,7 @@ msgid ""
 msgstr ""
 "<guilabel>Пароль</guilabel>: в этом поле вам следует указать пароль. Цвет "
 "отметки защищенности рядом с полем соответствует сложности пароля (см. также "
-"<xref linkend=\"givePassword\"></xref>)"
+"<xref linkend=\"givePassword\"/>)"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/addUser.xml:92
@@ -347,7 +343,6 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/addUser.xml:106
-#, fuzzy
 msgid ""
 "If you don't want a world readable home directory for anyone, it is advised "
 "to only add a temporary user now and to add the real one(s)  after reboot."
@@ -384,15 +379,13 @@ msgstr "Дополнительные возможности управления
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:125
-#, fuzzy
 msgid ""
 "If the <guibutton>advanced</guibutton> button is clicked you are offered a "
 "screen that allows you to edit the settings for the user you are adding."
 msgstr ""
 "Если вы нажмете кнопку <guibutton>Дополнительно</guibutton>, то программа "
 "откроет диалоговое окно, с помощью которого вы сможете изменить параметры "
-"учетной записи, которую вы добавляете. Кроме того, с помощью этого "
-"диалогового окна можно отключить или включить гостевой аккаунт."
+"учетной записи, которую вы добавляете."
 
 #. type: Content of: <section><section><para>
 #: en/addUser.xml:129
@@ -463,20 +456,19 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Выберете точки монтированния"
 
-#.  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 
+#.  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 
+#.        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 
+#.  And JohnR says the Americans are WRONG! :-))
+#.  2012-04-19  Language proofreading done
 #. type: Content of: <section><mediaobject>
 #: en/ask_mntpoint_s.xml:27
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "chooseMountpoints.png\" align=\"center\" format=\"PNG\" xml:id="
@@ -485,9 +477,12 @@ msgid ""
 "png\" align=\"center\" format=\"PNG\" xml:id=\"live-chooseMountPoints-"
 "im1\"></imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-chooseMountpoints.png"
-"\" align=\"center\" format=\"PNG\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/ask_mntpoint_s.xml:37
@@ -585,13 +580,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/bestTime.xml:14
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
 "format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-bestTime.png\" "
+"format=\"PNG\" revision=\"1\" xml:id=\"bestTime-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/bestTime.xml:20
@@ -661,9 +655,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Root.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -751,13 +745,12 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -947,8 +940,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Настройка ваших служб"
 
-#.  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 ""
@@ -1002,11 +995,10 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Настройка часового пояса"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id="
 "\"configureTimezoneUTC-im1\" revision=\"1\" fileref=\"dx2-"
@@ -1014,9 +1006,11 @@ msgid ""
 "<imageobject> <imagedata fileref=\"live-timeZone.png\" condition=\"live\" "
 "format=\"PNG\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </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
@@ -1604,7 +1598,6 @@ msgstr ""
 
 #. type: Content of: <section><para><itemizedlist><listitem><para>
 #: en/doPartitionDisks.xml:64
-#, fuzzy
 msgid ""
 "With this option, the installer displays the remaining Windows partition in "
 "light blue and the future Mageia partition in dark blue with their intended "
@@ -1775,15 +1768,13 @@ msgstr "<publisher> <publishername>Mageia.org</publishername> </publisher>"
 
 #. type: Content of: <book><info><revhistory><revision><date>
 #: en/DrakLive-cover.xml:10
-#, fuzzy
 msgid "January 2015"
-msgstr "Февраль 2014"
+msgstr "Январь 2015"
 
 #. type: Content of: <book><info><revhistory><revision><revremark>
 #: en/DrakLive-cover.xml:11
-#, fuzzy
 msgid "Mageia 5"
-msgstr "Mageia 4"
+msgstr "Mageia 5"
 
 #. type: Content of: <book><info><cover><para>
 #: en/DrakLive-cover.xml:15 en/DrakX-cover.xml:15
@@ -1877,9 +1868,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Поздравляем"
 
-#.  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
@@ -1940,13 +1931,12 @@ msgstr ""
 msgid "Formatting"
 msgstr "Форматирование"
 
-#.  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
-#, fuzzy
 msgid ""
 "<imageobject condition='classical'> <imagedata revision=\"1\" fileref=\"dx2-"
 "formatPartitions.png\" format=\"PNG\" align=\"center\" xml:id="
@@ -1955,9 +1945,12 @@ msgid ""
 "png\" format=\"PNG\" align=\"center\" xml:id=\"live-formatPartitions-im1\"> "
 "</imagedata> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-formatPartitions.png\" "
-"format=\"PNG\" align=\"center\" xml:id=\"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>"
 
 #. type: Content of: <section><para>
 #: en/formatPartitions.xml:30
@@ -2491,10 +2484,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Обновления"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2540,13 +2533,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"installer-im2\" align="
-"\"center\" format=\"PNG\" fileref=\"../dx-help.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2568,10 +2560,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Ещё больше информации доступно в <link ns4:href=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">вики Mageia</link>."
@@ -2581,9 +2572,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Выбор источника (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2742,18 +2733,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Резюме относительно других параметров"
 
-#.  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" 
+#. 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
@@ -3085,13 +3076,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/reboot.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-reboot.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"reboot-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/reboot.xml:19
@@ -3128,8 +3118,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Уровень безопасности"
 
-#.  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 ""
@@ -3763,16 +3753,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3829,8 +3824,8 @@ msgstr "Извлеките флешку USB. Запись завершена."
 msgid "Select your Country / Region"
 msgstr "Выбор страны и региона"
 
-#.  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 ""
@@ -4011,20 +4006,19 @@ msgstr ""
 
 #. type: Content of: <section><info><title>
 #: en/selectKeyboardLive.xml:3
-#, fuzzy
 msgid "Select keyboard"
-msgstr "Клавиатура"
+msgstr "Выбор клавиатуры"
 
 #. type: Content of: <section><mediaobject>
 #: en/selectKeyboardLive.xml:7
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata xml:id=\"selectKeyboardLive-im1\" revision=\"1\" "
 "align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.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=\"selectKeyboardLive-im1\" revision=\"1\" "
+"align=\"center\" format=\"PNG\" fileref=\"live-selectKeyboard.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><para>
 #: en/selectKeyboardLive.xml:12
@@ -4144,15 +4138,15 @@ 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 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\"/> </"
+"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
+"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><warning><para>
@@ -4183,36 +4177,34 @@ msgstr ""
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:54
-#, fuzzy
 msgid ""
 "This may be disabled in the \"multiple languages\" screen if you know that "
 "it is inappropriate for your language. Disabling UTF-8 applies to all "
 "installed languages."
 msgstr ""
-"По умолчанию в Mageia используется кодировка UTF-8 (Unicode). Эту кодировку "
-"можно отключить в окне выбора нескольких языков, если вам заранее известно, "
+"Кодировку можно отключить в окне выбора нескольких языков, если вам заранее "
+"известно, "
 "что Unicode несовместим с вашим языком. Выключение UTF-8 касается всех "
 "установленных языков."
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/selectLanguage.xml:60
-#, fuzzy
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
 msgstr ""
 "Изменить язык интерфейса системы после установки можно с помощью Центра "
-"управления Mageia -&gt; Система -&gt; Настройка локализации системы."
+"управления Mageia -> Система -> Настройка локализации системы."
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 msgid "Select mouse"
 msgstr "Выбор драйвера мыши"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4258,7 +4250,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4267,9 +4258,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" fileref=\"dx2-configureTimezoneUTC."
-"png\" align=\"center\" format=\"PNG\" xml:id=\"configureTimezoneUTC-im1\"></"
-"imagedata> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4289,15 +4283,14 @@ msgstr ""
 
 #. type: Content of: <section><section><note><para>
 #: en/setupBootloaderAddEntry.xml:26
-#, fuzzy
 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 ""
-"Если вами был выбран загрузчик <code>Grub 2</code> или Grub2-efi для систем "
-"с UEFI, тогда вы не сможете воспользоваться этим инструментом для "
+"Если вами был выбран загрузчик <code>Grub 2</code>, тогда вы не сможете "
+"воспользоваться этим инструментом для "
 "редактирования записей на следующем шаге, после нажатия кнопки «Далее». Вам "
 "следует воспользоваться другим графическим инструментом для редактирования, "
 "в частности <code>kcm-grub2</code>, <code>grub-customizer</code>, или внести "
@@ -4305,15 +4298,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4343,7 +4335,6 @@ msgstr ""
 
 #. type: Content of: <section><section><warning><para>
 #: en/setupBootloaderAddEntry.xml:49
-#, fuzzy
 msgid ""
 "Editing other things can leave you with an unbootable system.  Please don't "
 "just try something without knowing what you are doing."
@@ -4383,12 +4374,11 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:69
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"dx2-doPartitionDisks2.png\"/> </"
+"<imageobject> <imagedata fileref=\"dx2-bootloaderConfiguration2.png\"/> </"
 "imageobject>"
 
 #. type: Content of: <section><info><title>
@@ -4398,7 +4388,6 @@ msgstr "Основные параметры загрузчика"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4406,9 +4395,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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 condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4433,9 +4424,8 @@ msgstr ""
 
 #. type: Content of: <section><section><tip><para>
 #: en/setupBootloader.xml:32
-#, fuzzy
 msgid "The Mageia graphical menus are nice :"
-msgstr "Графические меню Mageia выглядят великолепно. :)"
+msgstr "Графические меню Mageia выглядят великолепно. :"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/setupBootloader.xml:37
@@ -4444,7 +4434,6 @@ msgstr "Использование загрузчика Mageia"
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:41
-#, fuzzy
 msgid ""
 "By default, Mageia writes a new GRUB (legacy) bootloader into the MBR "
 "(Master Boot Record)  of your first hard drive. If you already have other "
@@ -4467,7 +4456,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/setupBootloader.xml:51
-#, fuzzy
 msgid ""
 "Linux systems which use the GRUB2 bootloader are not currently supported by "
 "GRUB (legacy)  and will not be recognized if the default GRUB bootloader is "
@@ -4507,7 +4495,6 @@ msgstr ""
 
 #. type: Content of: <section><section><section><para>
 #: en/setupBootloader.xml:74
-#, fuzzy
 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 "
@@ -4581,15 +4568,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-media_selection.png"
-"\" format=\"PNG\" revision=\"1\" xml:id=\"media_selection-im1\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4613,14 +4599,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Настройка SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4662,7 +4648,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Настройка звука"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4740,12 +4726,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Подтверждение форматирования жесткого диска"
 
-#.  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 
+#.     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 ""
@@ -4782,15 +4768,14 @@ msgstr ""
 
 #. type: Content of: <section><section><info><title>
 #: en/testing.xml:14
-#, fuzzy
 msgid "Live mode"
-msgstr "Live носитель"
+msgstr "Режим Live"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/testing.xml:18
-#, fuzzy
 msgid "<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Download.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/testing.xml:23
@@ -4856,17 +4841,17 @@ msgstr ""
 
 #. type: Content of: <section><section><section><info><title>
 #: en/testing.xml:72
-#, fuzzy
 msgid "Launch installation"
-msgstr "Установка Mageia"
+msgstr "Запуск установки"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/testing.xml:76
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
 "imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"live-liveMode-install.png\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><section><section><para>
 #: en/testing.xml:81
@@ -4966,13 +4951,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:13
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
 "\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata align=\"center\" fileref=\"dx2-license.png\" format="
-"\"PNG\" revision=\"1\" xml:id=\"acceptLicense-im1\"/> </imageobject>"
+"<imageobject> <imagedata align=\"center\" fileref=\"live-unused.png\" format="
+"\"PNG\" revision=\"1\" xml:id=\"unused-im1\"/> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:19
@@ -4985,11 +4969,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"Checking.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/sk.po b/docs/installer/sk.po
index 25e09b0b..24667ca4 100644
--- a/docs/installer/sk.po
+++ b/docs/installer/sk.po
@@ -1,24 +1,24 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Jajo Pajo, 2016
-# Jajo Pajo, 2016
+# Jajo Pajo, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\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/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:59+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "sk/)\n"
 "Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -110,9 +110,9 @@ msgstr "sk"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Výber zdroja (Nastavenie doplnkových inštalačných zdrojov)"
 
-#.  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 ""
@@ -184,18 +184,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Spravovanie používateľa a superpoužívateľa"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -442,17 +442,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Zvoľte body pripojenia"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -653,9 +653,9 @@ msgstr "V zastaralom BIOS/CSM režime"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -762,13 +762,12 @@ msgstr "V UEFI režime"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -964,8 +963,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Nastavenie služieb"
 
-#.  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 ""
@@ -1017,8 +1016,8 @@ msgstr "Veci meňte len vtedy, keď veľmi dobre viete, čo robíte."
 msgid "Configure your Timezone"
 msgstr "Nastavenie časového pásma"
 
-#.  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 ""
@@ -1882,9 +1881,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Gratulujeme"
 
-#.  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
@@ -1944,10 +1943,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formátovanie"
 
-#.  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 ""
@@ -2481,10 +2480,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Aktualizácie"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2528,13 +2527,12 @@ msgstr "Prihlasovacia obrazovka"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2560,10 +2558,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Ďalšiu časť našej dokumentácie môžete nájsť na <link linkend=\"https://wiki."
 "mageia.org/en/Category:Documentation\">Mageia wiki</link>."
@@ -2573,9 +2570,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Výber nosiča (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2730,18 +2727,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Súhrn o rozličných parametroch"
 
-#.  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" 
+#. 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
@@ -3102,8 +3099,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Úroveň bezpečnosti"
 
-#.  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 ""
@@ -3744,16 +3741,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3763,16 +3765,21 @@ 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"
@@ -3827,8 +3834,8 @@ msgstr "Odpojte váš USB kľúč, je to hotovo."
 msgid "Select your Country / Region"
 msgstr "Vyberte si vašu Krajinu / Región"
 
-#.  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 ""
@@ -4138,7 +4145,6 @@ 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 "
@@ -4147,8 +4153,8 @@ msgid ""
 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>"
+"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
+"imageobject>"
 
 #. type: Content of: <section><warning><para>
 #: en/selectLanguage.xml:39
@@ -4200,10 +4206,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Výber myši"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4247,7 +4253,6 @@ msgstr "Pridanie alebo úprava položiek Ponuky na zavedenie systému"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4256,9 +4261,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4291,15 +4299,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4380,7 +4387,6 @@ msgstr "Hlavné parametre zavádzača"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4388,11 +4394,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4558,16 +4564,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </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 fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4599,14 +4603,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Nastavenie SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4648,7 +4652,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Konfigurácia zvuku"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4727,12 +4731,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Potvrdenie naformátovania pevného disku"
 
-#.  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 
+#.     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 ""
@@ -4984,13 +4988,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 7e8c4c85..71d8a650 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -1,18 +1,18 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) 2011 - 2016 Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Filip Komar <filip.komar@gmail.com>, 2013,2016
-# Rok Kepa <rokkepa@gmail.com>, 2014
+# Filip Komar <filip.komar@gmail.com>, 2013,2016.
+# Rok Kepa <rokkepa@gmail.com>, 2014.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-07-15 07:32+0000\n"
-"Last-Translator: Filip Komar <filip.komar@gmail.com>\n"
-"Language-Team: Slovenian <lugos-slo@lugos.si>, Translation list <mageia-"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 12:00+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
 "i18n@mageia.org>, Slovenian (http://www.transifex.com/MageiaLinux/mageia/"
 "language/sl/)\n"
 "Language: sl\n"
@@ -21,6 +21,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -108,9 +109,9 @@ msgstr "sl"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Izbira virov (nastavitev dodatnih virov namestitve)"
 
-#.  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 ""
@@ -167,18 +168,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Upravljanje z naprednimi in navadnimi uporabniki"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -366,17 +367,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Izberite priklopne točke"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -538,9 +539,9 @@ msgstr "V načinu BIOS/CSM/Legacy"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -629,13 +630,12 @@ msgstr "V načinu UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -795,8 +795,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Nastavite vaše storitve"
 
-#.  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 ""
@@ -845,8 +845,8 @@ msgstr ""
 msgid "Configure your Timezone"
 msgstr "Nastavite vaš časovni pas"
 
-#.  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 ""
@@ -1553,9 +1553,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Čestitke"
 
-#.  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
@@ -1607,10 +1607,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatiranje"
 
-#.  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 ""
@@ -2042,10 +2042,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Posodobitve"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2084,13 +2084,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2113,18 +2112,20 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
+"Najdete jih <link ns4:href=\"http://www.mageia.org/sl/downloads/\">tukaj</"
+"link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2243,18 +2244,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  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" 
+#. 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
@@ -2562,8 +2563,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Stopnja varnosti"
 
-#.  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 ""
@@ -3123,16 +3124,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3182,8 +3188,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr ""
 
-#.  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 ""
@@ -3471,10 +3477,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr ""
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3512,7 +3518,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3521,9 +3526,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3549,15 +3557,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -3624,7 +3631,6 @@ msgstr "Glavne možnosti zagonskega nalagalnika"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -3632,11 +3638,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -3762,16 +3768,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -3795,14 +3799,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr ""
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -3837,7 +3841,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Nastavitve zvoka"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -3898,12 +3902,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr ""
 
-#.  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 
+#.     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 ""
@@ -4114,13 +4118,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index 24c71bf6..51561f8c 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -1,24 +1,25 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Ardit Dani <ardit.dani@gmail.com>, 2014
-# Ardit Dani <ardit.dani@gmail.com>, 2014-2016
+# Ardit Dani <ardit.dani@gmail.com>, 2014.
+# Ardit Dani <ardit.dani@gmail.com>, 2014-2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-05-19 09:07+0000\n"
-"Last-Translator: Ardit Dani <ardit.dani@gmail.com>\n"
-"Language-Team: Albanian (http://www.transifex.com/MageiaLinux/mageia/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 12:00+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "language/sq/)\n"
 "Language: sq\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -110,9 +111,9 @@ msgstr "sq"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Përzgjedhja Media (Konfiguro Plotësues Media Instalimi)"
 
-#.  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 ""
@@ -183,18 +184,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Menaxher për Përdorues dhe Super-përdoruesin "
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -443,17 +444,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Zgjidhni pikat montuese"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -642,9 +643,9 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -734,13 +735,12 @@ msgstr "Në mënyrë UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -935,8 +935,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfiguro shërbimet tuaja"
 
-#.  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 ""
@@ -989,8 +989,8 @@ msgstr "Vetëm ndrysho gjërat, kur ju e dini shumë mirë se çfarë po bëni."
 msgid "Configure your Timezone"
 msgstr "Konfiguro kohën-zonës tuaj"
 
-#.  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 ""
@@ -1833,9 +1833,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Urime"
 
-#.  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
@@ -1896,10 +1896,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Ndarjet"
 
-#.  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 ""
@@ -2381,10 +2381,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Azhurnime"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2428,13 +2428,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2457,18 +2456,20 @@ msgstr ""
 #. type: Content of: <section><para>
 #: en/login.xml:3
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
+"Ju mund ti gjeni <link linkend=\"https://wiki.mageia.org/en/Category:Documenta"
+"tion\">këtu</link>."
 
 #. type: Content of: <section><info><title>
 #: en/media_selection.xml:3
 msgid "Media Selection (Nonfree)"
 msgstr ""
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2593,18 +2594,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr ""
 
-#.  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" 
+#. 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
@@ -2923,8 +2924,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Niveli Sigurisë"
 
-#.  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 ""
@@ -3486,16 +3487,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3549,8 +3555,8 @@ msgstr ""
 msgid "Select your Country / Region"
 msgstr "Zgjidhni Shtetin tuaj / Rajonin"
 
-#.  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 ""
@@ -3844,10 +3850,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Zgjidh miun"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3885,7 +3891,6 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3894,9 +3899,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3922,15 +3930,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -3995,7 +4002,6 @@ msgstr "Opsionet kryesore të programit Bootloader"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4003,11 +4009,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4133,15 +4139,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition='classical'> <imagedata fileref=\"dx2-diskdrake.png\" "
-"align=\"center\"/> </imageobject> <imageobject condition='live' > <imagedata "
-"fileref=\"live-diskdrake.png\" align=\"center\"/> </imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4165,14 +4170,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr ""
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4207,7 +4212,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Konfigurimi zërit"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4268,12 +4273,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Konfirmo diskun për tu formatuar"
 
-#.  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 
+#.     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 ""
@@ -4485,11 +4490,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"../Fdisk.png\"/> </imageobject>"
+msgstr ""
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
@@ -4497,3 +4503,4 @@ msgid ""
 "The next step is the copying of files on hard disk. This takes some minutes. "
 "At the end, you get a blank screen for some time, it's normal."
 msgstr ""
+
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index c24a5205..c9d6dd50 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -1,26 +1,26 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013
-# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013
-# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013-2016
-# Michael Eklund <willard@null.net>, 2014-2016
+# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013.
+# Kristoffer Grundström <kristoffer.grundstrom1983@gmail.com>, 2013-2016.
+# Michael Eklund <willard@null.net>, 2014-2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-05-24 15:42+0000\n"
-"Last-Translator: Michael Eklund <willard@null.net>\n"
-"Language-Team: Swedish (http://www.transifex.com/MageiaLinux/mageia/language/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 12:00+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "sv/)\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -111,9 +111,9 @@ msgstr "sv"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "Val av media (konfigurera kompletterande installationsmedier)"
 
-#.  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 ""
@@ -185,18 +185,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Hantering av användare och administratör"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -439,17 +439,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Välj monteringspunkter"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -650,9 +650,9 @@ msgstr "I BIOS/CSM/Legacy-läge"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -758,13 +758,12 @@ msgstr "I UEFI-läge"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -956,8 +955,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Konfigurera dina tjänster"
 
-#.  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 ""
@@ -1008,8 +1007,8 @@ msgstr "Ändra bara på saker när du vet mycket väl vad du gör."
 msgid "Configure your Timezone"
 msgstr "Ställ in din tidszon"
 
-#.  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 ""
@@ -1871,9 +1870,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Grattis"
 
-#.  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
@@ -1934,10 +1933,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Formatering"
 
-#.  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 ""
@@ -2470,10 +2469,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Uppdateringar"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2517,13 +2516,12 @@ msgstr "Inloggningsskärm"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2549,10 +2547,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Du hittar mer dokumentation i <link linkend=\"https://wiki.mageia.org/en/"
 "Category:Documentation\">Mageias Wiki</link>."
@@ -2562,9 +2559,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Val av media (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2716,18 +2713,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Sammanfattning av diverse parametrar"
 
-#.  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" 
+#. 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
@@ -3083,8 +3080,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Säkerhetsnivå"
 
-#.  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 ""
@@ -3722,16 +3719,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3741,16 +3743,21 @@ 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"
@@ -3805,8 +3812,8 @@ msgstr "Koppla från ditt USB-minne och sedan är allt klart."
 msgid "Select your Country / Region"
 msgstr "Välj ditt land / region"
 
-#.  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 ""
@@ -4177,10 +4184,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Välj mus"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4224,7 +4231,6 @@ msgstr "Lägg till eller ändra en post i bootmenyn"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4233,9 +4239,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4268,15 +4277,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4360,7 +4368,6 @@ msgstr "Huvudalternativ för startshanteraren"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4368,11 +4375,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4535,16 +4542,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4576,14 +4581,14 @@ msgstr "Ändra inte din \"startenhet\" om du inte verkligen vet vad du gör."
 msgid "Setup SCSI"
 msgstr "Ställ in SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4622,7 +4627,7 @@ msgstr "DrakX bör sedan kunna konfigurera disken korrekt."
 msgid "Sound Configuration"
 msgstr "Ljudkonfiguration"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4698,12 +4703,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Bekräfta hårddisken som ska formateras"
 
-#.  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 
+#.     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 ""
@@ -4956,13 +4961,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index f66b504d..8d33f6fc 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -1,25 +1,24 @@
-# 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.
+# Yuri Chornoivan <yurchor@ukr.net>, 2013, 2016.
 # kemalokmen <kemal@comu.edu.tr>, 2013, 2014.
 # Atilla ÖNTAŞ <tarakbumba@gmail.com>, 2013, 2014, 2015, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-04-03 22:04+0300\n"
-"Last-Translator: Atilla ÖNTAŞ <tarakbumba@gmail.com>\n"
-"Language-Team: Mageia Turkish Translation Team <i18n-tr@ml.mageia.org>\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 12:01+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -110,9 +109,9 @@ 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 ""
@@ -182,18 +181,18 @@ msgstr ""
 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 
+#.  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 
+#.        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 
+#.        "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
@@ -441,17 +440,17 @@ msgstr ""
 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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -654,9 +653,9 @@ msgstr "BIOS/CSM/Legacy kipinde"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -764,13 +763,12 @@ msgstr "UEFI kipinde"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -964,8 +962,8 @@ msgstr ""
 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 ""
@@ -1020,8 +1018,8 @@ msgstr ""
 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 ""
@@ -1884,9 +1882,9 @@ 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
@@ -1947,10 +1945,10 @@ msgstr ""
 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 ""
@@ -2484,10 +2482,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Güncellemeler"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2531,13 +2529,12 @@ msgstr "Giriş Ekranı"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2562,10 +2559,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"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."
@@ -2575,9 +2571,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Veri Kaynağı Seçimi (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2728,18 +2724,18 @@ msgstr ""
 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" 
+#. 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
@@ -3102,8 +3098,8 @@ msgstr ""
 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 ""
@@ -3744,16 +3740,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3763,16 +3764,21 @@ 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"
@@ -3828,8 +3834,8 @@ 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 ""
@@ -4200,10 +4206,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Fare seçin"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4248,7 +4254,6 @@ msgstr "Önyükleme Menü Girdisi Ekleme veya Değiştirme"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4257,9 +4262,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4292,15 +4300,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4384,7 +4391,6 @@ msgstr "Önyükleyici ana seçenekleri"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4392,11 +4398,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4560,16 +4566,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4602,14 +4606,14 @@ 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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4649,7 +4653,7 @@ 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 ""
@@ -4726,12 +4730,12 @@ msgstr ""
 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 
+#.     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 ""
@@ -4987,13 +4991,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index 151e45b9..44a9b2c5 100644
--- a/docs/installer/uk.po
+++ b/docs/installer/uk.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-02-10 16:36+0200\n"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 11:31+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -108,9 +108,9 @@ msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr ""
 "Вибір носія (налаштовування додаткових носіїв пакунків для встановлення)"
 
-#.  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 ""
@@ -184,18 +184,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "Керування обліковими записами користувача і адміністратора"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -454,17 +454,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "Виберіть точки монтування"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -672,9 +672,9 @@ msgstr "У застарілому режимі BIOS/CSM"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -786,13 +786,12 @@ msgstr "У режимі UEFI"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -998,8 +997,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "Налаштування ваших служб"
 
-#.  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 ""
@@ -1052,8 +1051,8 @@ msgstr "Вносьте зміни, лише якщо вам добре відо�
 msgid "Configure your Timezone"
 msgstr "Налаштування часового поясу"
 
-#.  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 ""
@@ -1940,9 +1939,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "Вітаємо"
 
-#.  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
@@ -2003,10 +2002,10 @@ msgstr ""
 msgid "Formatting"
 msgstr "Форматування"
 
-#.  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 ""
@@ -2558,10 +2557,10 @@ msgstr ""
 msgid "Updates"
 msgstr "Поновлення"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2607,13 +2606,12 @@ msgstr "Вікно вітання"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2639,10 +2637,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "Іншу частину документації можна знайти у <link linkend=\"https://wiki.mageia."
 "org/en/Category:Documentation\">вікі Mageia</link>."
@@ -2652,9 +2649,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "Вибір носія (з пакунками, які не є вільними)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2811,18 +2808,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "Резюме щодо інших параметрів"
 
-#.  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" 
+#. 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
@@ -3200,8 +3197,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "Рівень безпеки"
 
-#.  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 ""
@@ -3857,16 +3854,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3876,16 +3878,21 @@ 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"
@@ -3940,8 +3947,8 @@ msgstr "Витягніть флешку USB. Запис завершено."
 msgid "Select your Country / Region"
 msgstr "Вибір країни і регіону"
 
-#.  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 ""
@@ -4318,10 +4325,10 @@ msgstr ""
 msgid "Select mouse"
 msgstr "Вибір драйвера миші"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -4366,7 +4373,6 @@ msgstr "Додавання пункту меню завантаження та �
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -4375,9 +4381,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -4412,15 +4421,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4504,7 +4512,6 @@ msgstr "Основні параметри завантажувача"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4512,11 +4519,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4684,16 +4691,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4727,14 +4732,14 @@ msgstr ""
 msgid "Setup SCSI"
 msgstr "Налаштування SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4776,7 +4781,7 @@ msgstr ""
 msgid "Sound Configuration"
 msgstr "Налаштування звуку"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4855,12 +4860,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "Підтвердження форматування жорсткого диска"
 
-#.  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 
+#.     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 ""
@@ -5125,13 +5130,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30
diff --git a/docs/installer/zh_CN.po b/docs/installer/zh_CN.po
index 934fa0d7..7fcd5533 100644
--- a/docs/installer/zh_CN.po
+++ b/docs/installer/zh_CN.po
@@ -1,28 +1,27 @@
-# SOME DESCRIPTIVE TITLE
 # Copyright (C) YEAR Mageia
 # This file is distributed under the same license as the Mageia Installer Help package.
 #
 # Translators:
-# 吴善俊 <sjwuny@126.com>, 2013
-# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014
-# xiao wenming <xwm-citcc5@hotmail.com>, 2015
-# zwpwjwtz <zwpwjwtz@126.com>, 2016
-# 吴善俊 <sjwuny@126.com>, 2013
-# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014
+# 吴善俊 <sjwuny@126.com>, 2013.
+# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014.
+# xiao wenming <xwm-citcc5@hotmail.com>, 2015.
+# zwpwjwtz <zwpwjwtz@126.com>, 2016.
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2016-07-17 11:22+0300\n"
-"PO-Revision-Date: 2016-07-12 12:36+0000\n"
-"Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
+"POT-Creation-Date: 2016-07-17 11:30+0300\n"
+"PO-Revision-Date: 2016-07-17 12:01+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 1.5\n"
 
 #. type: Content of: <section><info><title>
 #: en/acceptLicense.xml:25
@@ -111,9 +110,9 @@ msgstr "zh_CN"
 msgid "Media Selection (Configure Supplemental Installation Media)"
 msgstr "介质选择 (设置增补的安装介质)"
 
-#.  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 ""
@@ -178,18 +177,18 @@ msgstr ""
 msgid "User and Superuser Management"
 msgstr "用户和管理员管理"
 
-#.  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 
+#.  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 
+#.        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 
+#.        "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
@@ -409,17 +408,17 @@ msgstr ""
 msgid "Choose the mount points"
 msgstr "选择挂载点"
 
-#.  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 
+#.  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 
+#.        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 
+#.  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 ""
@@ -452,8 +451,7 @@ msgstr ""
 msgid ""
 "If you change anything, make sure you still have a <literal>/</literal> "
 "(root) partition."
-msgstr ""
-"如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
+msgstr "如果进行了更改，请确保你仍然具有访问 <literal>/</literal> （根）分区的权限。"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/ask_mntpoint_s.xml:48
@@ -601,9 +599,9 @@ msgstr "在 BIOS/CSM/Legacy 模式下"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:12
-#, fuzzy
 msgid "<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
-msgstr "<imageobject> <imagedata fileref=\"live-bootCSM.png\"/> </imageobject>"
+msgstr ""
+"<imageobject><imagedata fileref=\"../live-bootCSM.png\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:12
@@ -700,13 +698,12 @@ msgstr "在 UEFI 模式下"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/bootLive.xml:29
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
 "align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" fileref=\"live-"
-"bootUEFI.png\" format=\"PNG\" xml:id=\"bootUEFI-im1\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" fileref=\"../live-bootUEFI.png\" "
+"align=\"center\" xml:id=\"bootUEFI-im1\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><section><mediaobject><caption><para>
 #: en/bootLive.xml:29
@@ -884,8 +881,8 @@ msgstr ""
 msgid "Configure your Services"
 msgstr "配置服务"
 
-#.  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 ""
@@ -932,8 +929,8 @@ msgstr "只有在您完全了解您的行为的风险后再作出改动。"
 msgid "Configure your Timezone"
 msgstr "配置时区"
 
-#.  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 ""
@@ -968,8 +965,7 @@ msgstr "在下一个窗口中，您可以将硬件时钟设置为本地时间或
 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 ""
-"若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
+msgstr "若您安装了多个操作系统，请确保硬件时钟均被设为本地时间，或均为 UTC/GMT。"
 
 #. type: Content of: <section><info><title>
 #: en/configureX_card_list.xml:11
@@ -1041,8 +1037,7 @@ msgstr ""
 msgid ""
 "Be aware that if you select an incompatible driver you may only have access "
 "to the Commandline Interface."
-msgstr ""
-"请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。"
+msgstr "请注意，若选择了不兼容的驱动，您可能无法使用图形化界面（但仍可使用命令行）。"
 
 #. type: Content of: <section><para>
 #: en/configureX_card_list.xml:51
@@ -1719,9 +1714,9 @@ msgstr "Mageia 4"
 msgid "Congratulations"
 msgstr "恭喜"
 
-#.  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
@@ -1775,10 +1770,10 @@ msgstr "若您有任何疑问，或希望帮助完善 Mageia，请访问 www.mag
 msgid "Formatting"
 msgstr "格式化"
 
-#.  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 ""
@@ -1907,8 +1902,7 @@ msgstr "在此页中，可以进行自定义设置："
 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 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
+msgstr "按 F2 选择语言（仅用于安装，可能与系统所选语言有出入）（仅用于传统模式）。"
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:66
@@ -2156,8 +2150,7 @@ msgstr ""
 msgid ""
 "Most screens have <guibutton>Help</guibutton> buttons which give further "
 "explanations about the current step."
-msgstr ""
-"多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
+msgstr "多数窗口中有<guibutton>帮助</guibutton>按钮，可以提供当前操作的有关说明。"
 
 #. type: Content of: <section><section><note><para>
 #: en/installer.xml:214
@@ -2268,10 +2261,10 @@ msgstr ""
 msgid "Updates"
 msgstr "更新"
 
-#.  Made by marja on 2012 03 30 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja, 2012-04-24 added screenshot
 #. type: Content of: <section><mediaobject>
 #: en/installUpdates.xml:13
 msgid ""
@@ -2314,13 +2307,12 @@ msgstr "登录界面"
 
 #. type: Content of: <section><mediaobject>
 #: en/login.xml:1
-#, fuzzy
 msgid ""
 "<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
 "login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" align=\"center\" xml:id=\"login-"
-"im1\" format=\"PNG\" fileref=\"live-login.png\"/> </imageobject>"
+"<imageobject><imagedata format=\"PNG\" xml:id=\"login-im1\" fileref=\"live-"
+"login.png\" align=\"center\" revision=\"1\"/></imageobject>"
 
 #. type: Content of: <section><mediaobject><caption><para>
 #: en/login.xml:1
@@ -2344,10 +2336,9 @@ msgstr ""
 
 #. type: Content of: <section><para>
 #: en/login.xml:3
-#, fuzzy
 msgid ""
-"You can find another part of our documentation in <link xmlns:ns0=\"http://"
-"www.w3.org/1999/xlink\" ns0:href=\"../../installer/\">the Mageia wiki</link>."
+"You can find another part of our documentation in <link linkend=\"https://"
+"wiki.mageia.org/en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
 "可以在 <link linkend=\"https://wiki.mageia.org/en/Category:Documentation"
 "\">Mageia wiki</link> 中找到有关系统使用的方法。"
@@ -2357,9 +2348,9 @@ msgstr ""
 msgid "Media Selection (Nonfree)"
 msgstr "介质选择 (Nonfree)"
 
-#.  papoteur 2013-04-11  - created 
+#.  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-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
@@ -2497,18 +2488,18 @@ msgstr ""
 msgid "Summary of miscellaneous parameters"
 msgstr "一些杂项"
 
-#.  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" 
+#. 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
@@ -2609,8 +2600,7 @@ msgstr "<guilabel>服务</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 ""
-"系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
+msgstr "系统服务指在后台运行的小程序（守护进程）。此工具允许您启用或禁用特定任务。"
 
 #. type: Content of: <section><section><itemizedlist><listitem><para>
 #: en/misc-params.xml:95
@@ -2839,8 +2829,8 @@ msgstr ""
 msgid "Security Level"
 msgstr "安全级别"
 
-#.  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 ""
@@ -2936,8 +2926,7 @@ 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 ""
-"媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
+msgstr "媒介：是一类承载 ISO 文件、可以用于安装和/或更新 Mageia 的任意物理介质。"
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:46
@@ -3039,8 +3028,7 @@ msgstr "Live 媒介"
 msgid ""
 "Can be used to preview the distribution without installing it on a HDD, and "
 "optionally install Mageia on to your HDD."
-msgstr ""
-"可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
+msgstr "可以用于预览该发行版，而无需将其安装到硬盘上。也可以用于安装 Mageia 至硬盘。"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:131
@@ -3258,8 +3246,7 @@ msgstr ""
 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 ""
-"然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
+msgstr "然后比较执行结果（可能需要等待一段时间）和 Mageia 网上提供的数值。例如："
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:335
@@ -3400,8 +3387,7 @@ msgstr "打开一个终端"
 msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final '-' )"
-msgstr ""
-"使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
+msgstr "使用命令 <userinput>su -</userinput> 获取 root 权限（不要漏掉末尾的“-”）"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:413
@@ -3441,16 +3427,21 @@ msgstr ""
 msgid ""
 "[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"
@@ -3460,16 +3451,21 @@ 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"
@@ -3491,8 +3487,7 @@ msgstr ""
 msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
-msgstr ""
-"输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
+msgstr "输入命令：# <userinput>dd if=ISO文件的完整路径 of=/dev/sdX bs=1M</userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:469
@@ -3523,8 +3518,8 @@ msgstr "操作完成，拔下 U 盘"
 msgid "Select your Country / Region"
 msgstr "选择您所在的国家/地区"
 
-#.  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 ""
@@ -3853,18 +3848,17 @@ msgstr ""
 msgid ""
 "You can change the language of your system after installation in the Mageia "
 "Control Center -> System -> Manage localization for your system."
-msgstr ""
-"您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
+msgstr "您可以在安装完成后，在 Mageia 控制中心 -> 系统 -> 管理本地化 中改变系统语言。"
 
 #. type: Content of: <section><info><title>
 #: en/selectMouse.xml:4
 msgid "Select mouse"
 msgstr "选择鼠标"
 
-#.  Made by marja on 2012 04 11 
-#.  NEEDS TO BE REVIEWED! 
+#.  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 
+#.  marja 2012-04-24 adding screenshot
 #. type: Content of: <section><mediaobject>
 #: en/selectMouse.xml:16
 msgid ""
@@ -3906,7 +3900,6 @@ msgstr "添加或修改引导菜单项"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:10
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata format=\"PNG\" xml:id="
 "\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
@@ -3915,9 +3908,12 @@ msgid ""
 "fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
 "> </imageobject>"
 msgstr ""
-"<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 format=\"PNG\" xml:id="
+"\"bootloaderConfiguration-im1\" fileref=\"dx2-bootloaderConfiguration.png\" "
+"align=\"center\" revision=\"1\"/> </imageobject> <imageobject condition="
+"\"live\"> <imagedata format=\"PNG\" xml:id=\"bootloaderConfiguration-im1\" "
+"fileref=\"live-bootloaderConfiguration.png\" align=\"center\" revision=\"1\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><section><title>
 #: en/setupBootloaderAddEntry.xml:19 en/setupBootloader.xml:20
@@ -3948,15 +3944,14 @@ msgstr ""
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloaderAddEntry.xml:33
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
 "im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
 "\"1\"/> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata revision=\"1\" xml:id=\"setupBootloaderAddEntry-"
-"im1\" align=\"center\" format=\"PNG\" fileref=\"dx2-setupBootloaderAddEntry."
-"png\"/> </imageobject>"
+"<imageobject> <imagedata format=\"PNG\" xml:id=\"setupBootloaderAddEntry-"
+"im1\" align=\"center\" fileref=\"dx2-setupBootloaderAddEntry.png\" revision="
+"\"1\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloaderAddEntry.xml:38
@@ -4028,7 +4023,6 @@ msgstr "引导程序的主要选项"
 
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata xml:id=\"setupBootloader-"
 "im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
@@ -4036,11 +4030,11 @@ msgid ""
 "xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
 "\"1\" fileref=\"live-setupBootloader.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=\"setupBootloader-"
+"im1\" format=\"PNG\" fileref=\"dx2-setupBootloader.png\" align=\"center\" "
+"revision=\"1\"/> </imageobject> <imageobject condition=\"live\"> <imagedata "
+"xml:id=\"setupBootloader-im1\" format=\"PNG\" align=\"center\" revision="
+"\"1\" fileref=\"live-setupBootloader.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:22
@@ -4102,8 +4096,7 @@ msgstr ""
 msgid ""
 "The best solution here is to use the GRUB2 bootloader which is available at "
 "the Summary page during installation."
-msgstr ""
-"最好的解决方法是使用 GRUB 2 引导器，可以在安装过程中的摘要页面中选择安装。"
+msgstr "最好的解决方法是使用 GRUB 2 引导器，可以在安装过程中的摘要页面中选择安装。"
 
 #. type: Content of: <section><section><section><info><title>
 #: en/setupBootloader.xml:64
@@ -4182,21 +4175,18 @@ msgstr ""
 msgid ""
 "With an UEFI system, the user interface is slightly different as you cannot "
 "choose the boot loader since only Grub2-efi is available."
-msgstr ""
-"对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
+msgstr "对于 UEFI，用户界面会稍有不同，您将无法选择引导器（因为只能使用 Grub2-efi）。"
 
 #. type: Content of: <section><section><mediaobject>
 #: en/setupBootloader.xml:118
-#, fuzzy
 msgid ""
 "<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
 "setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
 "<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 msgstr ""
-"<imageobject condition=\"classical\"> <imagedata align=\"center\" fileref="
-"\"dx2-selectLanguage.png\" format=\"PNG\"/> </imageobject> <imageobject "
-"condition=\"live\"> <imagedata fileref=\"live-language.png\" format=\"\"/> </"
-"imageobject>"
+"<imageobject condition=\"classical\"> <imagedata fileref=\"dx2-"
+"setupBootloader2.png\"/> </imageobject> <imageobject condition=\"live\"> "
+"<imagedata fileref=\"live-setupBootloader2.png\"/> </imageobject>"
 
 #. type: Content of: <section><section><para>
 #: en/setupBootloader.xml:126
@@ -4225,14 +4215,14 @@ msgstr "若您不确定如何操作，请不要修改“引导设备”。"
 msgid "Setup SCSI"
 msgstr "设置SCSI"
 
-#.  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 
+#.  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 
+#.        Mdv doc instead of on our setupSCSI file
 #. type: Content of: <section><mediaobject>
 #: en/setupSCSI.xml:26
 msgid ""
@@ -4269,7 +4259,7 @@ msgstr "随后 DrakX 应当能正确配置这些驱动器。"
 msgid "Sound Configuration"
 msgstr "声音配置"
 
-#.  Started by marja on 2013-12-07 
+#.  Started by marja on 2013-12-07
 #. type: Content of: <section><mediaobject>
 #: en/soundConfig.xml:17
 msgid ""
@@ -4285,8 +4275,7 @@ 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 ""
-"这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
+msgstr "这一界面中列出了安装程序为声卡选定的驱动，如果有默认驱动则将其作为默认配置。"
 
 #. type: Content of: <section><para>
 #: en/soundConfig.xml:27
@@ -4340,12 +4329,12 @@ msgstr ""
 msgid "Confirm hard disk to be formatted"
 msgstr "确定要格式化的硬盘"
 
-#.  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 
+#.     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 ""
@@ -4582,13 +4571,12 @@ msgstr ""
 
 #. type: Content of: <section><mediaobject>
 #: en/unused.xml:25
-#, fuzzy
 msgid ""
 "<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
 "> </imageobject>"
 msgstr ""
-"<imageobject> <imagedata fileref=\"live-unused-InstallationProgress.png\"/> "
-"</imageobject>"
+"<imageobject> <imagedata fileref=\"../live-unused-InstallationProgress.png\"/"
+"> </imageobject>"
 
 #. type: Content of: <section><para>
 #: en/unused.xml:30