Updates and fixes

25 files changed, 730 insertions, 763 deletions

diff --git a/docs/installer/ca.po b/docs/installer/ca.po
index 17501005..0cfdb27f 100644
--- a/docs/installer/ca.po
+++ b/docs/installer/ca.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/mageia/language/"
@@ -90,7 +90,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "ca"
 
@@ -3786,17 +3786,17 @@ msgstr ""
 "totes les particions, tots els sistemes operatius i totes les dades del disc."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3804,7 +3804,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3812,30 +3812,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/cs.po b/docs/installer/cs.po
index 58f6c999..4d0b1501 100644
--- a/docs/installer/cs.po
+++ b/docs/installer/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-22 06:30+0000\n"
 "Last-Translator: Jiří Vírava <appukonrad@gmail.com>\n"
 "Language-Team: Czech (http://www.transifex.com/projects/p/mageia/language/"
@@ -94,7 +94,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "cs"
 
@@ -3325,17 +3325,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3343,7 +3343,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3351,32 +3351,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 
 #~ msgid ""
diff --git a/docs/installer/de.po b/docs/installer/de.po
index 00ebbc96..12fb822e 100644
--- a/docs/installer/de.po
+++ b/docs/installer/de.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-10-12 12:54+0000\n"
 "Last-Translator: psyca\n"
 "Language-Team: German (http://www.transifex.com/projects/p/mageia/language/"
@@ -101,7 +101,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "de"
 
@@ -3960,17 +3960,17 @@ msgstr ""
 "wollen."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3978,7 +3978,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3986,30 +3986,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/el.po b/docs/installer/el.po
index cf93564b..9da2534b 100644
--- a/docs/installer/el.po
+++ b/docs/installer/el.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-05 09:40+0000\n"
 "Last-Translator: JimSp472000 <jimspentzos2000@gmail.com>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/mageia/language/"
@@ -93,7 +93,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "el"
 
@@ -3875,17 +3875,17 @@ msgstr ""
 "συστημάτων και όλων των δεδομένων στον συγκεκριμένο σκληρό δίσκο."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3893,7 +3893,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3901,30 +3901,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/en/uninstall-Mageia.xml b/docs/installer/en/uninstall-Mageia.xml
index 8ff29a52..9cfc5d15 100644
--- a/docs/installer/en/uninstall-Mageia.xml
+++ b/docs/installer/en/uninstall-Mageia.xml
@@ -1,44 +1,38 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:id="uninstall-Mageia" xml:lang="en"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1999/xhtml"
-         xmlns:ns2="http://www.w3.org/1999/xlink"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:id="uninstall-Mageia">
   <info>
-    <title xml:id="drakrpm-edit-media-ti1">Uninstall Media</title>
+    <title xml:id="uninstall-Mageia-ti1">Uninstall Media</title>
   </info>
 
   <!-- -->
 
   <section>
-    <title xml:id="drakrpm-edit-media-columns">Howto</title>
+    <title xml:id="uninstall-Mageia-ti2">Howto</title>
 
     <para>If Mageia didn't convince you or you can't install it correctly, in
     short you want get rid of it. That is your right and Mageia give you also
     the possibility to be uninstalled. That is not true for every operating
-    system. </para>
+    system.</para>
 
     <para>After your data backup, reboot on your Mageia DVD and select Rescue
     system, then, Restore Windows boot loader. At the next boot, you will only
-    have Windows without any menu to choose your operating system. </para>
+    have Windows without any menu to choose your operating system.</para>
 
-    <para>To get back the place used by Mageia partitions on Windows, click on
-    <code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer
-    Management -&gt; Storage -&gt; Disk Management</code> to access to the
+    <para>To get back the space used by Mageia partitions on Windows, click on
+    <code>Start -> Control Panel -> Administrative Tools -> Computer
+    Management -> Storage -> Disk Management</code> to access to the
     partition management. You will recognize the Mageia partition because they
     are labeled <guilabel>Unknown</guilabel>, and also by there size and place
     in the disk. Right click on one of these partitions and select
-    <guibutton>Delete</guibutton>. The space will be freed. </para>
+    <guibutton>Delete</guibutton>. The space will be freed.</para>
 
     <para>If you have XP, you can create a new partition and format it (FAT32
-    or NTFS). It will get a partition letter. </para>
+    or NTFS). It will get a partition letter.</para>
 
     <para>If you have Vista or 7, you have one more possibility, you can
     extend the existing partition that is at the left hand of the free space.
-    It also exists in the shops or in the Internet, shareware, free or not,
-    that allows more possibilities for XP, Vista or 7 (Gparted for example).
-    That is at your own risk. </para>
+    There are other partitioning tools that can be used, such as gparted,
+    available for both windows and linux. As always, when changing partitions,
+    be very careful, and make sure all important things have been backed
+    up.</para>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/eo.po b/docs/installer/eo.po
index 77c26c89..c3cda586 100644
--- a/docs/installer/eo.po
+++ b/docs/installer/eo.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/mageia/"
@@ -94,7 +94,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "eo"
 
@@ -3644,17 +3644,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3662,7 +3662,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3670,30 +3670,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/es.po b/docs/installer/es.po
index 618afdd9..86c98ca0 100644
--- a/docs/installer/es.po
+++ b/docs/installer/es.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-25 13:57+0000\n"
 "Last-Translator: Fernando J. E. Aren <phy.tester@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/mageia/language/"
@@ -99,7 +99,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "es"
 
@@ -3898,17 +3898,17 @@ msgstr ""
 "todas las particiones, sistemas operativos y datos de su disco duro."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3916,7 +3916,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3924,32 +3924,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 
 #~ msgid ""
diff --git a/docs/installer/et.po b/docs/installer/et.po
index e7c98b0c..b2b3c4be 100644
--- a/docs/installer/et.po
+++ b/docs/installer/et.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia Installer Help\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-10-13 00:19+0300\n"
 "Last-Translator: Marek Laane <bald@smail.ee>\n"
 "Language-Team: Estonian <i18n-et@ml.mageia.org>\n"
@@ -90,7 +90,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "et"
 
@@ -99,9 +99,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 ""
@@ -154,19 +154,19 @@ 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
-#.  marja 2013-04-26 added new note
+#.        "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:27
 msgid ""
@@ -404,17 +404,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 ""
@@ -665,8 +665,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 ""
@@ -720,8 +720,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:20
 msgid ""
@@ -1443,9 +1443,9 @@ msgstr ""
 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
@@ -1505,10 +1505,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 ""
@@ -1692,8 +1692,8 @@ msgid ""
 "<guilabel>Boot options</guilabel> and propose four entries:"
 msgstr ""
 "Kui paigaldamine ei õnnestu, võib olla vajalik seda uuesti proovida, "
-"kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale "
-"tekstirea <guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
+"kasutades mõnda lisavõtit. Klahviga F6 avatav menüü toob nähtavale tekstirea "
+"<guilabel>Alglaadimise sätted</guilabel> ja pakub nelja valikut:"
 
 #. type: Content of: <section><itemizedlist><listitem><para>
 #: en/installer.xml:99
@@ -1729,8 +1729,8 @@ msgid ""
 "When you select one of these entries, it modifies the default options "
 "displayed in the <guilabel>Boot Options</guilabel> line."
 msgstr ""
-"Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida "
-"näeb real <guilabel>Alglaadimise sätted</guilabel>."
+"Mõnda neist valikutest valides muutuvad vaikimisi võtmed, mida näeb real "
+"<guilabel>Alglaadimise sätted</guilabel>."
 
 #. type: Content of: <section><itemizedlist><listitem><note><para>
 #: en/installer.xml:116
@@ -1739,9 +1739,9 @@ msgid ""
 "key F6 does not appear in the <guilabel>Boot Options</guilabel> line, "
 "however, they are really taken into account."
 msgstr ""
-"Mõne Mageia väljalaske puhul võib juhtuda, et klahviga F6 valitud "
-"kirjeid ei näe real <guilabel>Alglaadimise sätted</guilabel>, aga "
-"neid siiski arvestatakse."
+"Mõne Mageia väljalaske puhul võib juhtuda, et klahviga F6 valitud kirjeid ei "
+"näe real <guilabel>Alglaadimise sätted</guilabel>, aga neid siiski "
+"arvestatakse."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:123
@@ -1762,9 +1762,9 @@ msgid ""
 "the arrow keys and press Enter to have more details or press the Esc key to "
 "go back to the welcome screen."
 msgstr ""
-"Klahvile F1 vajutades ilmub uus aken saadaolevate võtmetega. Valige "
-"neist vajalik ja vajutage klahvile Enter üksikasjade nägemiseks või "
-"klahvile Esc tervitusekraani juurde naasmiseks."
+"Klahvile F1 vajutades ilmub uus aken saadaolevate võtmetega. Valige neist "
+"vajalik ja vajutage klahvile Enter üksikasjade nägemiseks või klahvile Esc "
+"tervitusekraani juurde naasmiseks."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:139
@@ -1781,11 +1781,10 @@ msgid ""
 "These options can by added by hand in the <guilabel>Boot options</guilabel> "
 "line."
 msgstr ""
-"Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. "
-"Vajutage klahvile Esc või valige <guilabel>Tagasi alglaadimise "
-"sätete juurde</guilabel>, et minna tagasi võtmete loendisse. "
-"Võtmeid saab lisada käsitsi reale <guilabel>Alglaadimise "
-"sätted</guilabel>."
+"Siin on näidatud võtme splash üksikasjaliku kirjelduse aken. Vajutage "
+"klahvile Esc või valige <guilabel>Tagasi alglaadimise sätete juurde</"
+"guilabel>, et minna tagasi võtmete loendisse. Võtmeid saab lisada käsitsi "
+"reale <guilabel>Alglaadimise sätted</guilabel>."
 
 #. type: Content of: <section><itemizedlist><listitem><mediaobject>
 #: en/installer.xml:152
@@ -1805,8 +1804,8 @@ msgid ""
 "Here is the default welcome screen when using a Wired Network-based "
 "Installation CD (Boot.iso or Boot-Nonfree.iso images):"
 msgstr ""
-"Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse "
-"CD (Boot.iso või Boot-Nonfree.iso tõmmis) kasutamisel:"
+"Selline on vaikimisi tervitusekraan juhtmega võrgu põhise paigalduse CD "
+"(Boot.iso või Boot-Nonfree.iso tõmmis) kasutamisel:"
 
 #. type: Content of: <section><para>
 #: en/installer.xml:169
@@ -1816,10 +1815,10 @@ msgid ""
 "based Installation CD, see <link ns2:href=\"https://wiki.mageia.org/en/Boot."
 "iso_install\">the Mageia Wiki</link>"
 msgstr ""
-"See ei võimalda muuta keelt ning saadaolevad võtmed on loetletud "
-"ekraanil. Rohkem teavet juhtmega võrgu põhise paigaldamise CD "
-"kasutamise kohta leiab <link ns2:href=\"https://wiki.mageia.org/en/"
-"Boot.iso_install\">Mageia Wikist</link>."
+"See ei võimalda muuta keelt ning saadaolevad võtmed on loetletud ekraanil. "
+"Rohkem teavet juhtmega võrgu põhise paigaldamise CD kasutamise kohta leiab "
+"<link ns2:href=\"https://wiki.mageia.org/en/Boot.iso_install\">Mageia "
+"Wikist</link>."
 
 #. type: Content of: <section><warning><para>
 #: en/installer.xml:175
@@ -1977,22 +1976,22 @@ msgid ""
 "<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
 "\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
 msgstr ""
-"Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all "
-"\"dynamic\" tavalise \"basic\" asemel, siis arvestage, et Mageiat ei saa "
-"sellisele kettale paigaldada. Kuidas tavalisele kettavormingule tagasi "
-"minna, saab lugeda Microsofti dokumentatsioonist: "
-"<link ns2:href=\"http://msdn.microsoft.com/en-us/library/cc776315.aspx"
-"\">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>."
+"Kui olete valinud oma kõvaketta vorminguks Microsoft Windowsi all \"dynamic"
+"\" tavalise \"basic\" asemel, siis arvestage, et Mageiat ei saa sellisele "
+"kettale paigaldada. Kuidas tavalisele kettavormingule tagasi minna, saab "
+"lugeda Microsofti dokumentatsioonist: <link ns2:href=\"http://msdn.microsoft."
+"com/en-us/library/cc776315.aspx\">http://msdn.microsoft.com/en-us/library/"
+"cc776315.aspx</link>."
 
 #. type: Content of: <section><info><title>
 #: en/installUpdates.xml:3
 msgid "Updates"
 msgstr "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 ""
@@ -2033,9 +2032,9 @@ msgstr "Seejärel klõpsake jätkamiseks <guibutton>Edasi</guibutton>."
 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
@@ -2154,18 +2153,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
@@ -2494,8 +2493,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 ""
@@ -2560,8 +2559,8 @@ msgid ""
 "You can find them <link ns4:href=\"http://www.mageia.org/en/downloads/"
 "\">here</link>."
 msgstr ""
-"ISO-tõmmised leiab <link ns4:href=\"http://www.mageia.org/en/"
-"downloads/\">siit</link>."
+"ISO-tõmmised leiab <link ns4:href=\"http://www.mageia.org/en/downloads/"
+"\">siit</link>."
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:21
@@ -2618,7 +2617,8 @@ msgid ""
 "You'll be given the choice during the installation to add or not non free "
 "software."
 msgstr ""
-"Paigaldamise käigus lastakse valida, kas kasutada mittevaba tarkvara või mitte"
+"Paigaldamise käigus lastakse valida, kas kasutada mittevaba tarkvara või "
+"mitte"
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:64
@@ -2663,9 +2663,8 @@ msgid ""
 "Can be used to preview the distribution without first installing it on a "
 "HDD, and optionally install Mageia on your HDD."
 msgstr ""
-"Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe "
-"kõvakettale paigaldamata, aga soovi korral siiski ka Mageia "
-"paigaldamiseks"
+"Saab tarvitada distributsiooni tundmaõppimiseks ilma seda kohe kõvakettale "
+"paigaldamata, aga soovi korral siiski ka Mageia paigaldamiseks"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:102
@@ -2679,9 +2678,8 @@ msgid ""
 "installations, they cannot be used to upgrade from previous releases.</"
 "emphasis>"
 msgstr ""
-"<emphasis role=\"bold\">LiveISO-sid saab kasutada ainult puhta "
-"paigalduse, mitte aga uuendamise jaoks varasemalt "
-"versioonilt.</emphasis>"
+"<emphasis role=\"bold\">LiveISO-sid saab kasutada ainult puhta paigalduse, "
+"mitte aga uuendamise jaoks varasemalt versioonilt.</emphasis>"
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:117
@@ -2748,9 +2746,9 @@ msgid ""
 "local network or on the Internet."
 msgstr ""
 "Need on väikesed tõmmised, mis sisaldavad vaid tarkvara, mida on vaja "
-"paigaldusprogrammi drakx käivitamiseks ning ISO-faili leidmiseks, et "
-"siis jätkata paigaldamisega. ISO-failid võivad asuda arvuti kõvakettal, "
-"mõnel muul kohalikul kettas, kohalikus võrgus või internetis."
+"paigaldusprogrammi drakx käivitamiseks ning ISO-faili leidmiseks, et siis "
+"jätkata paigaldamisega. ISO-failid võivad asuda arvuti kõvakettal, mõnel "
+"muul kohalikul kettas, kohalikus võrgus või internetis."
 
 #. type: Content of: <section><section><section><section><itemizedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:211
@@ -2760,8 +2758,8 @@ msgid ""
 "can't boot on a USB stick."
 msgstr ""
 "Need andmekandjad on väga väikesed (alla 100 MB) ja abiks siis, kui "
-"internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti "
-"on ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
+"internetiühenduse maht on liiga väike terve DVD allalaadimiseks, arvuti on "
+"ilma DVD-seadmeta või ei saa arvutit käivitada USB-pulga pealt."
 
 #. type: Content of: <section><section><section><section><title>
 #: en/SelectAndUseISOs2.xml:227
@@ -2786,8 +2784,8 @@ msgid ""
 "Contains non free software (mostly drivers, codecs...) for people who need "
 "it."
 msgstr ""
-"Sisaldab mittevaba tarkvara (peamiselt draiverid, koodekid jms.) neile, "
-"kes seda vajavad"
+"Sisaldab mittevaba tarkvara (peamiselt draiverid, koodekid jms.) neile, kes "
+"seda vajavad"
 
 #. type: Content of: <section><section><title>
 #: en/SelectAndUseISOs2.xml:251
@@ -2808,10 +2806,9 @@ msgid ""
 "chosen, you can also see something like"
 msgstr ""
 "Kui olete sobiva ISO-faili valinud, saab selle alla laadida kas HTTP või "
-"BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, "
-"näiteks kasutatava peegelsaidi ja võimaluse kohta seda vahetada, kui "
-"ribalaius on liiga väike. HTTP valimise korral peaks pilt olema umbes "
-"selline:"
+"BitTorrenti vahendusel. Mõlemal juhul annab aken mõningat teavet, näiteks "
+"kasutatava peegelsaidi ja võimaluse kohta seda vahetada, kui ribalaius on "
+"liiga väike. HTTP valimise korral peaks pilt olema umbes selline:"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:263
@@ -2832,13 +2829,12 @@ msgid ""
 "downloaded file is correct, or the number is different and you met a "
 "failure. Then this window appears:"
 msgstr ""
-"md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. "
-"Kasutada tuleks ainult üht neist. Mõlemad kuueteistkümnendarvud "
-"arvutatakse kindla algoritmiga allalaaditava faili põhjal. Kui paluda "
-"algoritmil arv uuesti leida allalaaditud faili põhjal, saab tulemuseks "
-"kas sama arvu, mis tähendab, et allalaaditud faili on korras, või "
-"siis mõne muu arvu, mis tähendab, et see ei ole korras. Seejärel "
-"ilmub järgmine aken:"
+"md5sum ja sha1sum on tööriistad ISO terviklikkuse kontrollimiseks. Kasutada "
+"tuleks ainult üht neist. Mõlemad kuueteistkümnendarvud arvutatakse kindla "
+"algoritmiga allalaaditava faili põhjal. Kui paluda algoritmil arv uuesti "
+"leida allalaaditud faili põhjal, saab tulemuseks kas sama arvu, mis "
+"tähendab, et allalaaditud faili on korras, või siis mõne muu arvu, mis "
+"tähendab, et see ei ole korras. Seejärel ilmub järgmine aken:"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:276
@@ -2866,8 +2862,8 @@ msgid ""
 "- To use md5sum, type: [sam@localhost]$ <userinput>md5sum path/to/the/image/"
 "file.iso</userinput>."
 msgstr ""
-"- md5sum kasutamiseks: [sam@localhost]$ <userinput>md5sum "
-"tõmmisefail.iso/asukoht</userinput>."
+"- md5sum kasutamiseks: [sam@localhost]$ <userinput>md5sum tõmmisefail.iso/"
+"asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:292
@@ -2875,8 +2871,8 @@ msgid ""
 "- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum path/to/the/"
 "image/file.iso</userinput>."
 msgstr ""
-"- sha1sum kasutamiseks: [sam@localhost]$ <userinput>sha1sum "
-"tõmmisefail.iso/asukoht</userinput>."
+"- sha1sum kasutamiseks: [sam@localhost]$ <userinput>sha1sum tõmmisefail.iso/"
+"asukoht</userinput>."
 
 #. type: Content of: <section><section><section><para>
 #: en/SelectAndUseISOs2.xml:295
@@ -2884,8 +2880,8 @@ 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 ""
-"ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) "
-"Mageia allalaadimissaidil näidatuga:"
+"ja võrrelge arvutis saadud arvu (võimalik, et peate natuke ootama) Mageia "
+"allalaadimissaidil näidatuga:"
 
 #. type: Content of: <section><section><section><mediaobject>
 #: en/SelectAndUseISOs2.xml:299
@@ -2907,9 +2903,8 @@ msgid ""
 "The checked ISO can now be burned on a CD or DVD or dumped on a USB stick. "
 "These operations are not a simple copy and aim at make a boot-able media."
 msgstr ""
-"Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. "
-"See ei ole tavaline kopeerimine, vaid eesmärk on luua käivitatav "
-"andmekandja."
+"Kontrollitud ISO võib nüüd kirjutada CD-le, DVD-le või USB-pulgale. See ei "
+"ole tavaline kopeerimine, vaid eesmärk on luua käivitatav andmekandja."
 
 #. type: Content of: <section><section><section><title>
 #: en/SelectAndUseISOs2.xml:316
@@ -2924,8 +2919,8 @@ msgid ""
 "not correct.  More information in <link ns4:href=\"https://wiki.mageia.org/"
 "en/Writing_CD_and_DVD_images\">the Mageia wiki</link>."
 msgstr ""
-"Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, "
-"et seade oleks määratud <emphasis role=\"bold\">kirjutama tõmmist</emphasis>, "
+"Kasutage soovikohast kirjutamisprogrammi, aga kontrollige kindlasti, et "
+"seade oleks määratud <emphasis role=\"bold\">kirjutama tõmmist</emphasis>, "
 "mitte aga andmeid või faile. Rohkem teavet leiab <link ns4:href=\"https://"
 "wiki.mageia.org/en/Writing_CD_and_DVD_images\">Mageia wikist</link>."
 
@@ -2940,8 +2935,8 @@ msgid ""
 "All Mageia ISOs are hybrid, which means you can 'dump' them on a USB stick "
 "and use it to boot and install the system."
 msgstr ""
-"Kõik Mageia ISO-d on hübriidsed, mis tähendab, et neid saab kirjutada "
-"ka USB-pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
+"Kõik Mageia ISO-d on hübriidsed, mis tähendab, et neid saab kirjutada ka USB-"
+"pulgale, mis on käivitatav ja mille pealt saab süsteemi paigaldada."
 
 #. type: Content of: <section><section><section><warning><para>
 #: en/SelectAndUseISOs2.xml:330
@@ -2971,8 +2966,8 @@ msgid ""
 "en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</link>"
 msgstr ""
 "Kasutada võib mõnda graafilist tööriista, näiteks <link ns4:href=\"https://"
-"wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">"
-"IsoDumper</link>."
+"wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks\">IsoDumper</"
+"link>."
 
 #. type: Content of: <section><section><section><section><para>
 #: en/SelectAndUseISOs2.xml:343
@@ -2990,8 +2985,8 @@ msgid ""
 "Become root with the command <userinput>su -</userinput> (don't forget the "
 "final -)"
 msgstr ""
-"Võtke administratsiooni õigused käsuga <userinput>su -</userinput> "
-"(ärge unustage kriipsukest lõpus)"
+"Võtke administratsiooni õigused käsuga <userinput>su -</userinput> (ärge "
+"unustage kriipsukest lõpus)"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><mediaobject>
 #: en/SelectAndUseISOs2.xml:355
@@ -3031,8 +3026,8 @@ msgid ""
 "Find the device name for your USB stick (by its size), for example /dev/sdb "
 "in the screenshot above, it is a 8Go USB stick."
 msgstr ""
-"Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud "
-"pildil on selleks /dev/sdb, mis on 8 GB suurune USB-pulk."
+"Leidke oma USB-pulga seadmenimi (suuruse järgi); näiteks toodud pildil on "
+"selleks /dev/sdb, mis on 8 GB suurune USB-pulk."
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:383
@@ -3040,8 +3035,8 @@ msgid ""
 "Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX "
 "bs=1M</userinput>"
 msgstr ""
-"Sisestage käsk # <userinput>dd if=ISO-faili/asukoht of=/dev/sdX "
-"bs=1M</userinput>"
+"Sisestage käsk # <userinput>dd if=ISO-faili/asukoht of=/dev/sdX bs=1M</"
+"userinput>"
 
 #. type: Content of: <section><section><section><section><orderedlist><listitem><para>
 #: en/SelectAndUseISOs2.xml:386
@@ -3097,8 +3092,8 @@ msgid ""
 "This step is detailed in <link ns4:href=\"http://www.mageia.org/en/doc/"
 "\">the Mageia documentation</link>."
 msgstr ""
-"Seda sammu kirjeldatakse üksikasjalikult <link ns4:href=\"http://"
-"www.mageia.org/et/doc/\">Mageia käsiraamatus</link>."
+"Seda sammu kirjeldatakse üksikasjalikult <link ns4:href=\"http://www.mageia."
+"org/et/doc/\">Mageia käsiraamatus</link>."
 
 #. type: Content of: <section><section><para>
 #: en/SelectAndUseISOs2.xml:420
@@ -3106,16 +3101,16 @@ msgid ""
 "More information, is available in <link ns4:href=\"https://wiki.mageia.org/"
 "en/Category:Documentation\">the Mageia wiki</link>."
 msgstr ""
-"Rohkem teavet leiab <link ns4:href=\"https://wiki.mageia.org/en/"
-"Category:Documentation\">Mageia wikist</link>."
+"Rohkem teavet leiab <link ns4:href=\"https://wiki.mageia.org/en/Category:"
+"Documentation\">Mageia wikist</link>."
 
 #. type: Content of: <section><info><title>
 #: en/selectCountry.xml:13
 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 ""
@@ -3447,10 +3442,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 ""
@@ -3576,7 +3571,7 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Alglaaduri põhiseadistused"
 
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
@@ -3745,14 +3740,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 ""
@@ -3792,7 +3787,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 ""
@@ -3869,12 +3864,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 ""
@@ -3903,83 +3898,84 @@ msgstr ""
 "kõik andmed."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr "Mageia eemaldamine"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr "Õpetus"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
 "possibility to be uninstalled. That is not true for every operating system."
 msgstr ""
-"Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge "
-"korralikult, võib tekkida soov sellest üldse lahti saada. Erinevalt "
-"mõnestki operatsioonisüsteemist Mageia arvestab teie sooviga "
-"ja võimaldab soovi korral ka endale täielikult selja keerata."
+"Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge korralikult, "
+"võib tekkida soov sellest üldse lahti saada. Erinevalt mõnestki "
+"operatsioonisüsteemist Mageia arvestab teie sooviga ja võimaldab soovi "
+"korral ka endale täielikult selja keerata."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
 "Windows without any menu to choose your operating system."
 msgstr ""
-"Kui olete oma andmed varundanud, taaskäivitage oma Mageia DVD ja "
-"valige Päästesüsteem ning seejärel käsk Restore Windows boot loader. "
-"Järgmisel arvuti käivitamisel ongi teie käsutuses ainult Windows, mitte "
-"enam võimalus operatsioonisüsteemi valida."
+"Kui olete oma andmed varundanud, taaskäivitage oma Mageia DVD ja valige "
+"Päästesüsteem ning seejärel käsk Restore Windows boot loader. Järgmisel "
+"arvuti käivitamisel ongi teie käsutuses ainult Windows, mitte enam võimalus "
+"operatsioonisüsteemi valida."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
-msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
-msgstr ""
-"Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide "
-"alla võttis, valige <code>Start -&gt; Control Panel -&gt; Administrative "
-"Tools -&gt; Computer Management -&gt; Storage -&gt; Disk "
-"Management</code>, mis avab partitsioonide haldamise tööriista. "
-"Mageia partitsiooni tunneb ära kirje <guilabel>Unknown</guilabel> "
-"ning samuti suuruse ja asukoha järgi kettal. Klõpsake mõnele Mageia "
-"partitsioonile hiire parema nupuga ja valige <guibutton>Delete</"
-"guibutton>. Ruum vabanebki."
+#: en/uninstall-Mageia.xml:20
+#, fuzzy
+msgid ""
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
+msgstr ""
+"Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis, "
+"valige <code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; "
+"Computer Management -&gt; Storage -&gt; Disk Management</code>, mis avab "
+"partitsioonide haldamise tööriista. Mageia partitsiooni tunneb ära kirje "
+"<guilabel>Unknown</guilabel> ning samuti suuruse ja asukoha järgi kettal. "
+"Klõpsake mõnele Mageia partitsioonile hiire parema nupuga ja valige "
+"<guibutton>Delete</guibutton>. Ruum vabanebki."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
-"Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas "
-"FAT32 või NTFS-vormingusse). Uuele partitsioonile antakse oma täht."
+"Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32 "
+"või NTFS-vormingusse). Uuele partitsioonile antakse oma täht."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 "Vista või 7 korral on veel üks võimalus: saab laiendada olemasolevat "
 "partitsiooni, mis asub vabanenud ruumist vasakul. Leidub ka teisi "
-"partitsioneerimistööriistu, mida saab kasutada, näiteks nii Windowsis "
-"kui ka Linuxis kättesaadav gparted. Nagu ikka partitsioonide muutmise "
-"korral, olge väga ettevaatlik ja kindlasti varundage eelnevalt kõik oma "
-"vähegi olulisemad andmed."
+"partitsioneerimistööriistu, mida saab kasutada, näiteks nii Windowsis kui ka "
+"Linuxis kättesaadav gparted. Nagu ikka partitsioonide muutmise korral, olge "
+"väga ettevaatlik ja kindlasti varundage eelnevalt kõik oma vähegi olulisemad "
+"andmed."
 
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"../dx-welcome.png\" "
diff --git a/docs/installer/et/uninstall-Mageia.xml b/docs/installer/et/uninstall-Mageia.xml
index 38689413..8d3ed498 100644
--- a/docs/installer/et/uninstall-Mageia.xml
+++ b/docs/installer/et/uninstall-Mageia.xml
@@ -1,47 +1,39 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="et" xml:id="uninstall-Mageia" xml:lang="et"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1999/xhtml"
-         xmlns:ns2="http://www.w3.org/1999/xlink"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="et" xml:id="uninstall-Mageia">
   <!-- -->
 <info>
-    <title xml:id="drakrpm-edit-media-ti1">Mageia eemaldamine</title>
+    <title xml:id="uninstall-Mageia-ti1">Mageia eemaldamine</title>
   </info>
 
   
 
   <section>
-    <title xml:id="drakrpm-edit-media-columns">Õpetus</title>
+    <title xml:id="uninstall-Mageia-ti2">Õpetus</title>
 
     <para>Kui Mageia ei võida teie poolehoidu või paigaldamine ei kulge korralikult,
 võib tekkida soov sellest üldse lahti saada. Erinevalt mõnestki
 operatsioonisüsteemist Mageia arvestab teie sooviga ja võimaldab soovi
-korral ka endale täielikult selja keerata. </para>
+korral ka endale täielikult selja keerata.</para>
 
     <para>Kui olete oma andmed varundanud, taaskäivitage oma Mageia DVD ja valige
 Päästesüsteem ning seejärel käsk Restore Windows boot loader. Järgmisel
 arvuti käivitamisel ongi teie käsutuses ainult Windows, mitte enam võimalus
-operatsioonisüsteemi valida. </para>
+operatsioonisüsteemi valida.</para>
 
-    <para>Ruumi tagasisaamiseks Windowsis, mida Mageia oma partitsioonide alla võttis,
-valige <code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt;
-Computer Management -&gt; Storage -&gt; Disk Management</code>, mis avab
-partitsioonide haldamise tööriista. Mageia partitsiooni tunneb ära kirje
-<guilabel>Unknown</guilabel> ning samuti suuruse ja asukoha järgi
-kettal. Klõpsake mõnele Mageia partitsioonile hiire parema nupuga ja valige
-<guibutton>Delete</guibutton>. Ruum vabanebki. </para>
+    <para>To get back the space used by Mageia partitions on Windows, click on
+<code>Start -> Control Panel -> Administrative Tools -> Computer Management
+-> Storage -> Disk Management</code> to access to the partition
+management. You will recognize the Mageia partition because they are labeled
+<guilabel>Unknown</guilabel>, and also by there size and place in the
+disk. Right click on one of these partitions and select
+<guibutton>Delete</guibutton>. The space will be freed.</para>
 
     <para>Kui teil on XP, saate luua uue partitsiooni ja selle vormindada (kas FAT32
-või NTFS-vormingusse). Uuele partitsioonile antakse oma täht. </para>
+või NTFS-vormingusse). Uuele partitsioonile antakse oma täht.</para>
 
-    <para>Vista või 7 korral on veel üks võimalus: saab laiendada olemasolevat
-partitsiooni, mis asub vabanenud ruumist vasakul. Leidub ka teisi
-partitsioneerimistööriistu, mida saab kasutada, näiteks nii Windowsis kui ka
-Linuxis kättesaadav gparted. Nagu ikka partitsioonide muutmise korral, olge
-väga ettevaatlik ja kindlasti varundage eelnevalt kõik oma vähegi olulisemad
-andmed. </para>
+    <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left hand of the free space.  There are
+other partitioning tools that can be used, such as gparted, available for
+both windows and linux. As always, when changing partitions, be very
+careful, and make sure all important things have been backed up.</para>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/eu.po b/docs/installer/eu.po
index c0939be1..bb4d79b6 100644
--- a/docs/installer/eu.po
+++ b/docs/installer/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-15 13:20+0000\n"
 "Last-Translator: Egoitz Rodriguez Obieta <egoitzro2@hotmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/mageia/language/"
@@ -91,7 +91,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "eu"
 
@@ -3478,17 +3478,17 @@ msgstr ""
 "guztiak."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3496,7 +3496,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3504,32 +3504,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 
 #~ msgid ""
diff --git a/docs/installer/fr.po b/docs/installer/fr.po
index 6a0e68cd..c8d6b191 100644
--- a/docs/installer/fr.po
+++ b/docs/installer/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-10-12 16:55+0000\n"
 "Last-Translator: Eric Barbero <dune06@free.fr>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/mageia/language/"
@@ -102,7 +102,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "fr"
 
@@ -4006,17 +4006,17 @@ msgstr ""
 "toutes les données présents sur ce disque dur."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr "Désinstaller le média"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr "Guide"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -4028,7 +4028,7 @@ msgstr ""
 "systèmes d'exploitation."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -4040,15 +4040,16 @@ msgstr ""
 "sans aucun menu pour choisir votre système d'exploitation."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
+#, fuzzy
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 "Pour récupérer la place prise par les partitions Mageia avec Windows, "
 "cliquez sur <code>Démarrer -&gt; Panneau de configuration -&gt; Outils "
@@ -4060,7 +4061,7 @@ msgstr ""
 "sélectionnez <guibutton>Supprimer</guibutton>. L'espace sera alors libéré."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
@@ -4070,13 +4071,14 @@ msgstr ""
 "la partition."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
+#, fuzzy
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 "Si vous disposez de Windows Vista ou de Windows 7, vous avez une possibilité "
 "supplémentaire, vous pouvez étendre la partition existante qui est à la "
diff --git a/docs/installer/fr/uninstall-Mageia.xml b/docs/installer/fr/uninstall-Mageia.xml
index e682076c..3093efe2 100644
--- a/docs/installer/fr/uninstall-Mageia.xml
+++ b/docs/installer/fr/uninstall-Mageia.xml
@@ -1,49 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="fr" xml:id="uninstall-Mageia" xml:lang="fr"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1999/xhtml"
-         xmlns:ns2="http://www.w3.org/1999/xlink"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="fr" xml:id="uninstall-Mageia">
   <!-- -->
 <info>
-    <title xml:id="drakrpm-edit-media-ti1">Désinstaller le média</title>
+    <title xml:id="uninstall-Mageia-ti1">Désinstaller le média</title>
   </info>
 
   
 
   <section>
-    <title xml:id="drakrpm-edit-media-columns">Guide</title>
+    <title xml:id="uninstall-Mageia-ti2">Guide</title>
 
     <para>Mageia ne vous convient pas ou vous ne pouvez pas l'installer correctement,
 en bref vous voulez vous en débarrasser. C'est votre droit et Mageia vous
 donne la possibilité d'être désinstallé. Ceci n'est pas vrai pour tous les
-systèmes d'exploitation. </para>
+systèmes d'exploitation.</para>
 
     <para>Après votre sauvegarde de données, redémarrez l'ordinateur sur votre DVD
 Mageia et sléectionnez "Système de secours", puis restaurez le chargeur
 d'amorçage de Windows. Au prochain démarrage, vous aurez uniquement Windows
-sans aucun menu pour choisir votre système d'exploitation. </para>
+sans aucun menu pour choisir votre système d'exploitation.</para>
 
-    <para>Pour récupérer la place prise par les partitions Mageia avec Windows,
-cliquez sur <code>Démarrer -&gt; Panneau de configuration -&gt; Outils
-d'administration -&gt; Gestion de l'ordinateur -&gt; Stockage -&gt; Gestion
-des disques</code> pour accéder à la gestion des partitions. Vous
-reconnaîtrez les partitions Mageia car elles sont dénommées
-<guilabel>Inconnu</guilabel>, et également par leur taille et leur position
-dans le disque. Faites un clic-droit sur l'une de ces partitions et
-sélectionnez <guibutton>Supprimer</guibutton>. L'espace sera alors libéré. </para>
+    <para>To get back the space used by Mageia partitions on Windows, click on
+<code>Start -> Control Panel -> Administrative Tools -> Computer Management
+-> Storage -> Disk Management</code> to access to the partition
+management. You will recognize the Mageia partition because they are labeled
+<guilabel>Unknown</guilabel>, and also by there size and place in the
+disk. Right click on one of these partitions and select
+<guibutton>Delete</guibutton>. The space will be freed.</para>
 
     <para>Si vous disposez de Windows XP, vous pouvez créer une nouvelle partition et
 la formater (en FAT32 ou NTFS). Cela vous fournira une lettre pour désigner
-la partition. </para>
+la partition.</para>
 
-    <para>Si vous disposez de Windows Vista ou de Windows 7, vous avez une possibilité
-supplémentaire, vous pouvez étendre la partition existante qui est à la
-gauche de l'espace libre. Il existe aussi dans les magasins ou sur Internet
-des partagiciels, libres ou non, qui offrent plus de possibilités pour
-Windows XP, Vista ou 7 (Gparted par exemple). Ceci se fait sous votre
-responsabilité. </para>
+    <para>If you have Vista or 7, you have one more possibility, you can extend the
+existing partition that is at the left hand of the free space.  There are
+other partitioning tools that can be used, such as gparted, available for
+both windows and linux. As always, when changing partitions, be very
+careful, and make sure all important things have been backed up.</para>
   </section>
-</section>
+</section>
\ No newline at end of file
diff --git a/docs/installer/help.pot b/docs/installer/help.pot
index c3f76e29..22651c43 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: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+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"
@@ -76,7 +76,7 @@ msgid ""
 msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
-#: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1 en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr ""
 
@@ -3130,17 +3130,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3148,7 +3148,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3156,30 +3156,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
-msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
+#: en/uninstall-Mageia.xml:20
+msgid ""
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management "
+"-> Storage -> Disk Management</code> to access to the partition "
+"management. You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the "
+"disk. Right click on one of these partitions and select "
 "<guibutton>Delete</guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/id.po b/docs/installer/id.po
index 26a0a387..eeda07a9 100644
--- a/docs/installer/id.po
+++ b/docs/installer/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/mageia/"
@@ -93,7 +93,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "id"
 
@@ -3781,17 +3781,17 @@ msgstr ""
 "tersebut."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3799,7 +3799,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3807,30 +3807,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/nl.po b/docs/installer/nl.po
index c3f5112a..9a689840 100644
--- a/docs/installer/nl.po
+++ b/docs/installer/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/mageia/language/"
@@ -94,7 +94,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "nl"
 
@@ -3809,17 +3809,17 @@ msgstr ""
 "wissen."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3827,7 +3827,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3835,30 +3835,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/pl.po b/docs/installer/pl.po
index 05d1b1c0..342246ad 100644
--- a/docs/installer/pl.po
+++ b/docs/installer/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/mageia/language/"
@@ -94,7 +94,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "pl"
 
@@ -3349,17 +3349,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3367,7 +3367,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3375,30 +3375,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/pt_BR.po b/docs/installer/pt_BR.po
index 1142dc97..cce91b00 100644
--- a/docs/installer/pt_BR.po
+++ b/docs/installer/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-22 01:20+0000\n"
 "Last-Translator: Marcio Andre Padula <padula1000@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
@@ -93,7 +93,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "pt_BR"
 
@@ -3885,17 +3885,17 @@ msgstr ""
 "rígido."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3903,7 +3903,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3911,32 +3911,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 
 #~ msgid ""
diff --git a/docs/installer/ro.po b/docs/installer/ro.po
index 88fce8c0..a736d3c8 100644
--- a/docs/installer/ro.po
+++ b/docs/installer/ro.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-10-02 16:02+0000\n"
 "Last-Translator: Florin Cătălin RUSSEN <cfrussen@yahoo.co.uk>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -96,7 +96,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "ro"
 
@@ -3959,17 +3959,17 @@ msgstr ""
 "toate partițiile, toate sistemele de operare și toate datele de pe acel disc."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3977,7 +3977,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3985,30 +3985,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/ru.po b/docs/installer/ru.po
index 2da9ecad..9538e146 100644
--- a/docs/installer/ru.po
+++ b/docs/installer/ru.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-09-12 23:50+0300\n"
 "Last-Translator: AlexL <loginov.alex.valer@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/mageia/language/"
@@ -97,7 +97,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "ru"
 
@@ -4044,17 +4044,17 @@ msgstr ""
 "хранящиеся на этом диске."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -4062,7 +4062,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -4070,32 +4070,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 
 #~ msgid ""
diff --git a/docs/installer/sl.po b/docs/installer/sl.po
index 1b78daa5..4ce44ed3 100644
--- a/docs/installer/sl.po
+++ b/docs/installer/sl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2013-12-09 19:12+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/mageia/"
@@ -92,7 +92,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "sl"
 
@@ -3277,17 +3277,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3295,7 +3295,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3303,32 +3303,32 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 
 #~ msgid ""
diff --git a/docs/installer/sq.po b/docs/installer/sq.po
index b1742c1e..f9cc6f1c 100644
--- a/docs/installer/sq.po
+++ b/docs/installer/sq.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-08-03 18:13+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/mageia/language/"
@@ -92,7 +92,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "sq"
 
@@ -3515,17 +3515,17 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3533,7 +3533,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3541,30 +3541,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/sv.po b/docs/installer/sv.po
index 823c0368..1f9d8be7 100644
--- a/docs/installer/sv.po
+++ b/docs/installer/sv.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-10-01 19:51+0000\n"
 "Last-Translator: Michael Eklund <willard@null.net>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/mageia/language/"
@@ -94,7 +94,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "sv"
 
@@ -3925,17 +3925,17 @@ msgstr ""
 "partitioner, operativsystem och data på på den hårddisken "
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3943,7 +3943,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3951,30 +3951,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/tr.po b/docs/installer/tr.po
index 85a979b6..fdeb12ee 100644
--- a/docs/installer/tr.po
+++ b/docs/installer/tr.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: doc-discuss@ml.mageia.org\n"
-"POT-Creation-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
 "PO-Revision-Date: 2014-10-02 07:50+0000\n"
 "Last-Translator: Fırat Kutlu <firatkutlu@gmail.com>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/mageia/language/"
@@ -95,7 +95,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "tr"
 
@@ -3936,17 +3936,17 @@ msgstr ""
 "veriyi silmeyi istiyorsanız <guibutton>İleri</guibutton>' yi tıklayın."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr ""
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -3954,7 +3954,7 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -3962,30 +3962,30 @@ msgid ""
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
 msgstr ""
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
diff --git a/docs/installer/uk.po b/docs/installer/uk.po
index e93a3e70..eefd4685 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: 2014-10-12 15:13+0300\n"
-"PO-Revision-Date: 2014-10-12 15:13+0300\n"
+"POT-Creation-Date: 2014-10-13 10:48+0300\n"
+"PO-Revision-Date: 2014-10-13 10:55+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
 "Language: uk\n"
@@ -90,7 +90,7 @@ msgstr ""
 
 #. type: Attribute 'xml:lang' of: <section>
 #: en/add_supplemental_media.xml:2 en/DrakX-cover.xml:2 en/DrakX.xml:1
-#: en/media_selection.xml:1 en/uninstall-Mageia.xml:2
+#: en/media_selection.xml:1 en/uninstall-Mageia.xml:1
 msgid "en"
 msgstr "uk"
 
@@ -100,9 +100,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 ""
@@ -158,19 +158,19 @@ 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 
-#.  marja 2013-04-26 added new note 
+#.        "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:27
 msgid ""
@@ -421,17 +421,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 ""
@@ -697,8 +697,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 ""
@@ -751,8 +751,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:20
 msgid ""
@@ -1498,9 +1498,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
@@ -1561,10 +1561,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 ""
@@ -2070,10 +2070,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 ""
@@ -2117,9 +2117,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
@@ -2242,18 +2242,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
@@ -2602,8 +2602,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 ""
@@ -3234,8 +3234,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 ""
@@ -3577,10 +3577,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 ""
@@ -3712,7 +3712,7 @@ msgstr ""
 msgid "Bootloader main options"
 msgstr "Основні параметри завантажувача"
 
-#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.  
+#.  2012-08-12 Copied this page, setupBootloader.xml,  from setupBootloaderBeginner.xml and REMOVED the string "Beginner" everywhere, except in this sentence.
 #.  2013-3-30 Removed refernce to bootloader expert page and suggest using grub2 where other grub2 systems exist
 #. type: Content of: <section><mediaobject>
 #: en/setupBootloader.xml:11
@@ -3884,14 +3884,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 ""
@@ -3933,7 +3933,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 ""
@@ -4012,12 +4012,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 ""
@@ -4047,17 +4047,17 @@ msgstr ""
 "цьому диску."
 
 #. type: Content of: <section><info><title>
-#: en/uninstall-Mageia.xml:10
+#: en/uninstall-Mageia.xml:3
 msgid "Uninstall Media"
 msgstr "Вилучення Mageia"
 
 #. type: Content of: <section><section><title>
-#: en/uninstall-Mageia.xml:16
+#: en/uninstall-Mageia.xml:9
 msgid "Howto"
 msgstr "Настанови"
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:18
+#: en/uninstall-Mageia.xml:11
 msgid ""
 "If Mageia didn't convince you or you can't install it correctly, in short "
 "you want get rid of it. That is your right and Mageia give you also the "
@@ -4069,7 +4069,7 @@ msgstr ""
 "можливість можна знайти не у кожній операційній системі."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:23
+#: en/uninstall-Mageia.xml:16
 msgid ""
 "After your data backup, reboot on your Mageia DVD and select Rescue system, "
 "then, Restore Windows boot loader. At the next boot, you will only have "
@@ -4081,20 +4081,20 @@ msgstr ""
 "вибору операційної системи."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:27
+#: en/uninstall-Mageia.xml:20
 msgid ""
-"To get back the place used by Mageia partitions on Windows, click on "
-"<code>Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer "
-"Management -&gt; Storage -&gt; Disk Management</code> to access to the "
-"partition management. You will recognize the Mageia partition because they "
-"are labeled <guilabel>Unknown</guilabel>, and also by there size and place "
-"in the disk. Right click on one of these partitions and select "
-"<guibutton>Delete</guibutton>. The space will be freed."
+"To get back the space used by Mageia partitions on Windows, click on "
+"<code>Start -> Control Panel -> Administrative Tools -> Computer Management -"
+"> Storage -> Disk Management</code> to access to the partition management. "
+"You will recognize the Mageia partition because they are labeled "
+"<guilabel>Unknown</guilabel>, and also by there size and place in the disk. "
+"Right click on one of these partitions and select <guibutton>Delete</"
+"guibutton>. The space will be freed."
 msgstr ""
 "Щоб скористатися місцем на диску, яке колись було зайнято розділами Mageia, "
-"у Windows, скористайтеся пунктом меню <code>Пуск -&gt; Панель керування -"
-"&gt; Засоби адміністрування -&gt; Керування комп’ютером -&gt; Сховища даних -"
-"&gt; Керування дисками</code>. У відповідь має бути відкрито сторінку "
+"у Windows, скористайтеся пунктом меню <code>Пуск -> Панель керування -> "
+"Засоби адміністрування -> Керування комп’ютером -> Сховища даних -> Керування "
+"дисками</code>. У відповідь має бути відкрито сторінку "
 "керування розділами. Розділ, куди було встановлено Mageia, можна визначити "
 "за міткою <guilabel>Невідомий</guilabel>, а також за розміром та "
 "розташуванням на диску. Клацніть правою кнопкою миші на такому розділі і "
@@ -4102,7 +4102,7 @@ msgstr ""
 "буде звільнено."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:35
+#: en/uninstall-Mageia.xml:28
 msgid ""
 "If you have XP, you can create a new partition and format it (FAT32 or "
 "NTFS). It will get a partition letter."
@@ -4112,21 +4112,21 @@ msgstr ""
 "відповідну літеру диска."
 
 #. type: Content of: <section><section><para>
-#: en/uninstall-Mageia.xml:38
+#: en/uninstall-Mageia.xml:31
 msgid ""
 "If you have Vista or 7, you have one more possibility, you can extend the "
-"existing partition that is at the left hand of the free space.  It also "
-"exists in the shops or in the Internet, shareware, free or not, that allows "
-"more possibilities for XP, Vista or 7 (Gparted for example).  That is at "
-"your own risk."
+"existing partition that is at the left hand of the free space.  There are "
+"other partitioning tools that can be used, such as gparted, available for "
+"both windows and linux. As always, when changing partitions, be very "
+"careful, and make sure all important things have been backed up."
 msgstr ""
 "Якщо на комп’ютері встановлено Vista або 7, у вас буде ще один можливий "
 "варіант: ви можете розширити наявний розділ за допомогою пункту, "
 "розташованого ліворуч від пункту вільного місця на диску. Крім того, можна "
 "скористатися вільними або комерційними програмами для XP, Vista або 7 "
 "(наприклад Gparted) за допомогою яких можна буде виконати додаткові дії з "
-"розділами. Відповідальність за наслідки цих дій, звичайно ж, покладається на "
-"вас самих."
+"розділами. Як і завжди, під час внесення змін до розділів слід бути дуже "
+"обережним і створювати резервні копії усіх важливих даних."
 
 #~ msgid ""
 #~ "<imageobject> <imagedata revision=\"1\" fileref=\"dx2-"
diff --git a/docs/installer/uk/uninstall-Mageia.xml b/docs/installer/uk/uninstall-Mageia.xml
index 340c0f41..5040a767 100644
--- a/docs/installer/uk/uninstall-Mageia.xml
+++ b/docs/installer/uk/uninstall-Mageia.xml
@@ -1,51 +1,43 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section version="5.0" xml:lang="uk" xml:id="uninstall-Mageia" xml:lang="uk"
-         xmlns="http://docbook.org/ns/docbook"
-         xmlns:ns5="http://www.w3.org/1998/Math/MathML"
-         xmlns:ns4="http://www.w3.org/2000/svg"
-         xmlns:ns3="http://www.w3.org/1999/xhtml"
-         xmlns:ns2="http://www.w3.org/1999/xlink"
-         xmlns:ns="http://docbook.org/ns/docbook">
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/1998/Math/MathML" xmlns:ns4="http://www.w3.org/2000/svg" xmlns:ns3="http://www.w3.org/1999/xhtml" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" version="5.0" xml:lang="uk" xml:id="uninstall-Mageia">
   <!-- -->
 <info>
-    <title xml:id="drakrpm-edit-media-ti1">Вилучення Mageia</title>
+    <title xml:id="uninstall-Mageia-ti1">Вилучення Mageia</title>
   </info>
 
   
 
   <section>
-    <title xml:id="drakrpm-edit-media-columns">Настанови</title>
+    <title xml:id="uninstall-Mageia-ti2">Настанови</title>
 
     <para>Якщо Mageia не задовольняє ваших потреб або ви не змогли належним чином
 встановити систему, у вас може виникнути потреба у вилученні
 дистрибутива. Це ваше право і у Mageia передбачено можливість вилучення
-системи. Таку можливість можна знайти не у кожній операційній системі. </para>
+системи. Таку можливість можна знайти не у кожній операційній системі.</para>
 
     <para>Після створення резервної копії даних, перезавантажте систему з DVD Mageia і
 виберіть пункт «Rescue system», далі «Restore Windows boot loader». Під час
 наступного завантаження системи завантажиться Windows без усіляких вікон
-вибору операційної системи. </para>
+вибору операційної системи.</para>
 
     <para>Щоб скористатися місцем на диску, яке колись було зайнято розділами Mageia,
-у Windows, скористайтеся пунктом меню <code>Пуск -&gt; Панель керування
--&gt; Засоби адміністрування -&gt; Керування комп’ютером -&gt; Сховища даних
--&gt; Керування дисками</code>. У відповідь має бути відкрито сторінку
-керування розділами. Розділ, куди було встановлено Mageia, можна визначити
-за міткою <guilabel>Невідомий</guilabel>, а також за розміром та
-розташуванням на диску. Клацніть правою кнопкою миші на такому розділі і
-виберіть пункт <guibutton>Вилучити</guibutton>. Після цього місце на диску
-буде звільнено. </para>
+у Windows, скористайтеся пунктом меню <code>Пуск -> Панель керування ->
+Засоби адміністрування -> Керування комп’ютером -> Сховища даних ->
+Керування дисками</code>. У відповідь має бути відкрито сторінку керування
+розділами. Розділ, куди було встановлено Mageia, можна визначити за міткою
+<guilabel>Невідомий</guilabel>, а також за розміром та розташуванням на
+диску. Клацніть правою кнопкою миші на такому розділі і виберіть пункт
+<guibutton>Вилучити</guibutton>. Після цього місце на диску буде звільнено.</para>
 
     <para>Якщо на комп’ютері встановлено XP, ви можете створити новий розділ і
 виконати його форматування (у FAT32 або NTFS). Система надасть йому
-відповідну літеру диска. </para>
+відповідну літеру диска.</para>
 
     <para>Якщо на комп’ютері встановлено Vista або 7, у вас буде ще один можливий
 варіант: ви можете розширити наявний розділ за допомогою пункту,
 розташованого ліворуч від пункту вільного місця на диску. Крім того, можна
 скористатися вільними або комерційними програмами для XP, Vista або 7
 (наприклад Gparted) за допомогою яких можна буде виконати додаткові дії з
-розділами. Відповідальність за наслідки цих дій, звичайно ж, покладається на
-вас самих. </para>
+розділами. Як і завжди, під час внесення змін до розділів слід бути дуже
+обережним і створювати резервні копії усіх важливих даних.</para>
   </section>
-</section>
+</section>
\ No newline at end of file