From 21310b5fb82d21ed3c92b73a75b7b90f70934b92 Mon Sep 17 00:00:00 2001
From: Yuri Chornoivan <yurchor@ukr.net>
Date: Sun, 3 Aug 2014 16:29:17 +0300
Subject: Update translation catalogs

---
 docs/installer/en/DrakX.xml     |  3 +++
 docs/installer/en/installer.xml | 30 +++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'docs/installer/en')

diff --git a/docs/installer/en/DrakX.xml b/docs/installer/en/DrakX.xml
index 42de6e29..f652bf74 100644
--- a/docs/installer/en/DrakX.xml
+++ b/docs/installer/en/DrakX.xml
@@ -25,9 +25,12 @@
 <!--2013-05-10 hid includes for resizeFATchoose.xml and takeOverHdChoose.xml, because since over a year ago, no one in docteam managed to make a screenshot of those installer screens. They seem to already have been obsoleted in Mandriva -->
 <!--2013-05-10 put ask_mntpoint_s.xml before takeOverHdConfirm.xml, to better reflect the order in which the links to them appear in doPartitionDisks.xml -->
 <!--2013-12-08 add soundConfig.xml -->
+<!--2014-05-07 add selectAndUseISOs2.xml Papoteur-->
   
   <!-- <xi:include href="drakx-intro.xml"/> -->
 
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
   <xi:include href="installer.xml"/>
 
   <xi:include href="selectLanguage.xml"/>
diff --git a/docs/installer/en/installer.xml b/docs/installer/en/installer.xml
index da773cf5..d354d060 100644
--- a/docs/installer/en/installer.xml
+++ b/docs/installer/en/installer.xml
@@ -34,8 +34,7 @@
       <title xml:id="installer-ti2">Installation Welcome Screen</title>
     </info>
 
-    <para>Here is the default welcome screen when using a Mageia
-    DVD:</para>
+    <para>Here is the default welcome screen when using a Mageia DVD:</para>
 
     <mediaobject>
       <imageobject>
@@ -65,8 +64,8 @@
 
       <para>Here is for example, the French welcome screen when using a Live
       DVD/CD. Note that the Live DVD/CD menu does not propose:
-      <guilabel>Rescue System</guilabel>, <guilabel>Memory test</guilabel> and <guilabel>Hardware
-      Detection Tool</guilabel>.</para>
+      <guilabel>Rescue System</guilabel>, <guilabel>Memory test</guilabel> and
+      <guilabel>Hardware Detection Tool</guilabel>.</para>
 
       <para/>
 
@@ -110,13 +109,14 @@
       Controller), it is about CPU interruptions, select this option if you
       are asked for.</para>
 
-      <para>When you select one of these entries, it modifies the default options
-      displayed in the <guilabel>Boot Options</guilabel> line.</para>
+      <para>When you select one of these entries, it modifies the default
+      options displayed in the <guilabel>Boot Options</guilabel> line.</para>
 
       <note>
         <para>In some Mageia releases, it may happen that the entries selected
-	  with the key F6 does not appear in the <guilabel>Boot Options</guilabel> line, however, they
-        are really taken into account.</para>
+        with the key F6 does not appear in the <guilabel>Boot
+        Options</guilabel> line, however, they are really taken into
+        account.</para>
       </note>
 
       <mediaobject>
@@ -168,7 +168,8 @@
 
   <para>It does not allow to change the language, the available options are
   described in the screen. For more information about using a Wired
-  Network-based Installation CD, see <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia Wiki</link></para>
+  Network-based Installation CD, see <link ns2:href="https://wiki.mageia.org/en/Boot.iso_install">the Mageia
+  Wiki</link></para>
 
   <warning>
     <para>The keyboard layout is the American one.</para>
@@ -262,6 +263,17 @@
         amount of RAM. e.g. <code>mem=256M</code> would specify 256MB of
         RAM.</para>
       </section>
+
+      <section xml:id="DynamicPartitions">
+        <info>
+          <title xml:id="DynamicPartitions-ti1">Dynamic partitions</title>
+        </info>
+
+        <para>If you converted your hard disk from "basic" format to "dynamic"
+        format on Microsoft Windows, you must know that it is impossible to
+        install Mageia on this disc. To go back to a basic disk, see the
+        Microsoft documentation: <link ns2:href="http://msdn.microsoft.com/en-us/library/cc776315.aspx">http://msdn.microsoft.com/en-us/library/cc776315.aspx</link>.</para>
+      </section>
     </section>
   </section>
 </section>
\ No newline at end of file
-- 
cgit v1.2.1