Update translations

3 files changed, 553 insertions, 35 deletions

diff --git a/docs/installer/ca/DrakX.xml b/docs/installer/ca/DrakX.xml
index d3b8ad6d..e42e4502 100644
--- a/docs/installer/ca/DrakX.xml
+++ b/docs/installer/ca/DrakX.xml
@@ -5,6 +5,7 @@
 <!--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"/>
  -->
 <info>
@@ -38,9 +39,12 @@ documentació</link>.</para>
 
 
 
+
   
   
 
+  <xi:include href="SelectAndUseISOs2.xml"/>
+
   <xi:include href="installer.xml"/>
 
   <xi:include href="selectLanguage.xml"/>
diff --git a/docs/installer/ca/SelectAndUseISOs2.xml b/docs/installer/ca/SelectAndUseISOs2.xml
new file mode 100644
index 00000000..979ebf27
--- /dev/null
+++ b/docs/installer/ca/SelectAndUseISOs2.xml
@@ -0,0 +1,411 @@
+<?xml version='1.0' encoding='utf-8'?><section 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" xmlns:ns="http://docbook.org/ns/docbook" xml:id="Select-and-use-ISOs" version="5.0" xml:lang="ca">
+
+  <info>
+    <!-- Made by Lebarhon 2014 03 26 -->
+<title xml:id="Select-and-use-ISOs-ti1">Select and use ISOs</title>
+  </info>
+
+  <section>
+    <title>Media</title>
+
+    <section>
+      <title>Definition</title>
+
+      <para>We call a media here a ISO image file that allows to install and/or update
+Mageia and by extension any physical support where the ISO file is copied.</para>
+
+      <para>You can find them <link
+ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
+    </section>
+
+    <section>
+      <title>Classical installation media</title>
+
+      <section>
+        <title>Common features</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>They use the traditional installer called drakx.</para>
+          </listitem>
+
+          <listitem>
+            <para>They are able to make a clean install or an update from previous releases.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>DVD</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>Different media for architecture 32 or 64 bits.</para>
+          </listitem>
+
+          <listitem>
+            <para>Some tools are available in the Welcome screen: Rescue System, Memory Test,
+Hardware Detection Tool.</para>
+          </listitem>
+
+          <listitem>
+            <para>Each DVD contains any available desktop environments and languages.</para>
+          </listitem>
+
+          <listitem>
+            <para>You'll be given the choice during the installation to add or not non free
+software.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>DVD dual arch</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>Both architectures are present on the same media, the choice is made
+automatically according to the detected CPU.</para>
+          </listitem>
+
+          <listitem>
+            <para>Xfce desktop only.</para>
+          </listitem>
+
+          <listitem>
+            <para>Some languages only (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk)
+TO BE CHECKED!</para>
+          </listitem>
+
+          <listitem>
+            <para>It contains non free software.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+
+    <section>
+      <title>Live media</title>
+
+      <section>
+        <title>Common features</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>Can be used to preview the distribution without first installing it on a
+HDD, and optionally install Mageia on your HDD.</para>
+          </listitem>
+
+          <listitem>
+            <para>ISO contains only one desktop environment (KDE or GNOME).</para>
+          </listitem>
+
+          <listitem>
+            <para>Different media for architecture 32 or 64 bits.</para>
+          </listitem>
+
+          <listitem>
+            <para><emphasis role="bold">Live ISOs can only be used to create clean
+installations, they cannot be used to upgrade from previous
+releases.</emphasis></para>
+          </listitem>
+
+          <listitem>
+            <para>They contains non free software.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>Live CD KDE</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>KDE desktop environment only.</para>
+          </listitem>
+
+          <listitem>
+            <para>English language only.</para>
+          </listitem>
+
+          <listitem>
+            <para>32 bits only.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>Live CD GNOME</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>GNOME desktop environment only.</para>
+          </listitem>
+
+          <listitem>
+            <para>English language only.</para>
+          </listitem>
+
+          <listitem>
+            <para>32 bits only.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>Live DVD KDE</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>KDE desktop environment only.</para>
+          </listitem>
+
+          <listitem>
+            <para>All languages are present.</para>
+          </listitem>
+
+          <listitem>
+            <para>Different media for architecture 32 or 64 bits.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>Live DVD GNOME</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>GNOME desktop environment only.</para>
+          </listitem>
+
+          <listitem>
+            <para>All languages are present.</para>
+          </listitem>
+
+          <listitem>
+            <para>Different media for architecture 32 or 64 bits.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+
+    <section>
+      <title>Boot-only CDs media</title>
+
+      <section>
+        <title>Common features</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>Each one is a small image that contains no more than that which is needed to
+start the drakx installer and find the ISO file to continue and complete the
+install. These ISO files may be on the PC hard disk, on a local drive, on a
+local network or on the Internet.</para>
+          </listitem>
+
+          <listitem>
+            <para>These media are very light (less than 100 Mo) and are convenient when
+bandwidth is too low to download a full DVD, PC without DVD drive or PC that
+can't boot on a USB stick.</para>
+          </listitem>
+
+          <listitem>
+            <para>Different media for architecture 32 or 64 bits.</para>
+          </listitem>
+
+          <listitem>
+            <para>English language only.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>boot.iso</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>Contains only free software, for people who refuse non free software.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+
+      <section>
+        <title>boot-nonfree.iso</title>
+
+        <itemizedlist>
+          <listitem>
+            <para>Contains non free software (mostly drivers, codecs...) for people who need
+it.</para>
+          </listitem>
+        </itemizedlist>
+      </section>
+    </section>
+  </section>
+
+  <section>
+    <title>Media downloading and checking</title>
+
+    <section>
+      <title>Downloading</title>
+
+      <para>Once you have chosen your ISO file, you can download it either using http or
+BitTorrent. In both cases, a window give you some information, like the used
+mirror and the possibility to change if the bandwidth is to low. If http is
+chosen, you can also see something like</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="Checking.png" contentwidth="650"/>
+</imageobject></mediaobject>
+
+      <para>md5sum and sha1sum are tools to check your ISO integrity. Use only one of
+them. Both hexadecimal numbers have been calculated by an algorithm from the
+file to be downloaded. If you ask this algorithm to calculate again this
+number from your downloaded file, either you have the same number and your
+downloaded file is correct, or the number is different and you met a
+failure. Then this window appears:</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
+
+      <para>Check the radio button Save File.</para>
+    </section>
+
+    <section>
+      <title>Checking the downloaded media integrity</title>
+
+      <para>Open a console, no need to be root, and:</para>
+
+      <para>- To use md5sum, type: [sam@localhost]$ <userinput>md5sum
+path/to/the/image/file.iso</userinput>.</para>
+
+      <para>- To use sha1sum, type: [sam@localhost]$ <userinput>sha1sum
+path/to/the/image/file.iso</userinput>.</para>
+
+      <para>and compare the obtained number on your computer (you may have to wait for a
+while) with the number given by Mageia. Example:</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="Md5sum.png" contentwidth="650"/>
+</imageobject></mediaobject>
+
+      <para/>
+    </section>
+  </section>
+
+  <section>
+    <title>Burn or dump the ISO</title>
+
+    <para>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.</para>
+
+    <section>
+      <title>Burn the ISO on a CD/DVD</title>
+
+      <para>Use whatever burner you want but ensure the burning device is set correctly
+to <emphasis role="bold">burn an image</emphasis>, burn data or files is not
+correct.  More information in <link
+ns4:href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images">the Mageia
+wiki</link>.</para>
+    </section>
+
+    <section>
+      <title>Dump the ISO on a USB stick</title>
+
+      <para>All Mageia ISOs are hybrid, which means you can 'dump' them on a USB stick
+and use it to boot and install the system.</para>
+
+      <warning>
+        <para>"dumping" an image onto a flash device destroys any prior file-system in the
+partition; any data will be lost and partition capacity will be reduced to
+the image size.</para>
+      </warning>
+
+      <para>To recover the original capacity, you have to format the USB stick.</para>
+
+      <section>
+        <title>Using Mageia</title>
+
+        <para>You can use a graphical tool like <link
+ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks">IsoDumper</link></para>
+
+        <para>You can also use the dd tool in a console:</para>
+
+        <orderedlist>
+          <listitem>
+            <para>Open a console</para>
+          </listitem>
+
+          <listitem>
+            <para>Become root with the command <userinput>su -</userinput> (don't forget the
+final -)</para>
+
+            <mediaobject>
+<imageobject> <imagedata fileref="Root.png" contentwidth="650"/>
+</imageobject></mediaobject>
+          </listitem>
+
+          <listitem>
+            <para>Plug your USB stick (do not mount it, that means do not open any application
+or file manager that read it)</para>
+          </listitem>
+
+          <listitem>
+            <para>Enter the command <userinput>fdisk -l</userinput></para>
+
+            <mediaobject>
+<imageobject> <imagedata fileref="Fdisk.png" contentwidth="650"/>
+</imageobject></mediaobject>
+          </listitem>
+
+          <listitem>
+            <para>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.</para>
+          </listitem>
+
+          <listitem>
+            <para>Enter the command: # <userinput>dd if=path/to/the/ISO/file of=/dev/sdX
+bs=1M</userinput></para>
+
+            <para>(x)=your device name eg: /dev/sdc Example: # <userinput>dd
+if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb
+bs=1M</userinput></para>
+          </listitem>
+
+          <listitem>
+            <para>Enter the command: # <userinput>sync</userinput></para>
+          </listitem>
+
+          <listitem>
+            <para>Unplug your USB stick, it is done</para>
+          </listitem>
+        </orderedlist>
+      </section>
+
+      <section>
+        <title>Using Windows</title>
+
+        <para>You can try:</para>
+
+        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
+
+        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+
+        <para/>
+      </section>
+    </section>
+  </section>
+
+  <section>
+    <title>Mageia Installation</title>
+
+    <para>This step is detailed in <link ns4:href="http://www.mageia.org/en/doc/">the
+Mageia documentation</link>.</para>
+
+    <para>More information, is available in <link
+ns4:href="https://wiki.mageia.org/en/Category:Documentation">the Mageia
+wiki</link>.</para>
+  </section>
+
+</section>
\ No newline at end of file
diff --git a/docs/installer/ca/installer.xml b/docs/installer/ca/installer.xml
index eab5d1aa..9ba8ffe8 100644
--- a/docs/installer/ca/installer.xml
+++ b/docs/installer/ca/installer.xml
@@ -1,5 +1,4 @@
-<?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="ca" xml:id="installer">
-
+<?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" xml:id="installer" version="5.0" xml:lang="ca">
   
 
   
@@ -38,16 +37,127 @@ If you have peripherals like printers or scanners, it is [best] to
 predeterminada engegarà l'instal·lador, que normalment és tot el que cal.</para>
 
   <figure xml:id="dx-welcome">
-<info>
+    <info>
       <title xml:id="installer-ti2">Pantalla de benvinguda de la instal·lació</title>
-    </info> <mediaobject>
-<imageobject> <imagedata revision="1" fileref="../dx-welcome.png"
-align="center" format="PNG" xml:id="BId-drakx-intro-im1"> </imagedata>
-</imageobject></mediaobject></figure>
+    </info>
+
+    <para>Here is the default welcome screen when using a Mageia DVD:</para>
+
+<mediaobject>
+<imageobject> <imagedata xml:id="BId-drakx-intro-im1" revision="1"
+align="center" format="PNG" fileref="../dx-welcome.png"/> </imageobject></mediaobject></figure>
+
+  <para>From this first screen, it is possible to set some personal preferences:</para>
+
+  <itemizedlist>
+    <listitem>
+      <para>The language (for the installation only, may be different that the chosen
+language for the system) by pressing the key F2</para>
+
+      <para/>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome-lang.png"/> </imageobject></mediaobject>
+
+      <para>Use the arrow keys to select the language and press the key Enter.</para>
+
+      <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>
+
+      <para/>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome4fr.png"/> </imageobject></mediaobject>
+
+      <para/>
+    </listitem>
+
+    <listitem>
+      <para>Change the screen resolution by pressing the F3 key.</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome5def.png"/> </imageobject></mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Add some kernel options by pressing the F6 key.</para>
+
+      <para>If the installation fails, then it may be necessary to try again using one
+of the extra options. The menu called by F6 displays a new line called
+<guilabel>Boot options</guilabel> and propose four entries:</para>
+
+      <para>- Default, it doesn't alter anything in the default options.</para>
+
+      <para>- Safe Settings, priority is given to the safer options to the detriment of
+performances.</para>
+
+      <para>- No ACPI (Advanced Configuration and Power Interface), power management
+isn't taken into account.</para>
+
+      <para>- No Local APIC (Local Advanced Programmable Interrupt 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>
+
+      <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>
+      </note>
 
-  <para>Si hi ha problemes durant la instal·lació, llavors potser cal utilitzar
-paràmetres especials d'instal·lació. Vegeu <xref
-linkend="installationOptions"></xref>.</para>
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcome6opt.png"/> </imageobject></mediaobject>
+    </listitem>
+
+    <listitem>
+      <para>Add more kernel options by pressing the key F1</para>
+
+      <para>Pressing F1 opens a new window with more available options. Select one with
+the arrow keys and press Enter to have more details or press the Esc key to
+go back to the welcome screen.</para>
+
+      <para/>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp1.png"/> </imageobject></mediaobject>
+
+      <para/>
+
+      <para>The detailed view about the option splash. Press Esc or select
+<guilabel>Return to Boot Options</guilabel> to go back to the options
+list. These options can by added by hand in the <guilabel>Boot
+options</guilabel> line.</para>
+
+      <mediaobject>
+<imageobject> <imagedata fileref="dx-welcomeHelp2.png"/> </imageobject></mediaobject>
+
+      <para/>
+
+      <note>
+        <para>The help is translated in the chosen language with the F2 key.</para>
+      </note>
+    </listitem>
+  </itemizedlist>
+
+  <para>Here is the default welcome screen when using a Wired Network-based
+Installation CD (Boot.iso or Boot-Nonfree.iso images):</para>
+
+  <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>
+
+  <warning>
+    <para>The keyboard layout is the American one.</para>
+  </warning>
+
+  <mediaobject>
+<imageobject> <imagedata revision="1" xml:id="installer-im2" align="center"
+format="PNG" fileref="../dx-help.png"/> </imageobject></mediaobject>
 
   <section xml:id="installationSteps">
     <info>
@@ -77,24 +187,6 @@ tecles <guibutton>Alt Ctrl F2</guibutton>. Després premeu alhora
   </section>
 
   <section xml:id="installationOptions">
-    <info>
-      <title xml:id="installationOptions-ti1">Opcions d'instal·lació</title>
-    </info>
-
-    <para>Si la instal·lació falla, potser és necessari tornar-ho a provar utilitzant
-alguna de les opcions addicionals disponibles prement el botó <guibutton>F1
-(Ajuda)</guibutton>. Vegeu <xref linkend="dx-welcome"/></para>
-
-    <para>Això obrirà l'ajuda següent en mode text.</para>
-
-    <figure xml:id="dx-help">
-<info>
-        <title xml:id="installationOptions-ti2">Pantalla d'ajuda de la instal·lació</title>
-      </info> <mediaobject>
-<imageobject> <imagedata revision="1" fileref="../dx-help.png"
-align="center" format="PNG" xml:id="installer-im2"></imagedata>
-</imageobject></mediaobject></figure>
-
     <section xml:id="installationProblems">
       <info>
         <title xml:id="installationProblems-ti1">Problemes en la instal·lació i possibles solucions</title>
@@ -114,12 +206,11 @@ antics. Proveu a fer servir una resolució baixa, teclejant
           </listitem>
 
           <listitem>
-            <para revision="2">Si el maquinari és molt antic, potser la instal·lació gràfica no és
-possible. En aquest cas val la pena provar una instal·lació en mode
-text. Per a fer-ho, premeu ESC a la primera pantalla de benvinguda, i
-confirmeu-ho amb la tecla de RETORN. Se us presentarà una pantalla negra amb
-la paraula «boot:». Teclegeu «text» i premeu la tecla de RETORN. Llavors
-continueu la instal·lació en mode text.<emphasis></emphasis></para>
+            <para revision="2">If the hardware is very old, a graphical installation may not be
+possible. In this case it is worth trying a text mode installation. To use
+this hit ESC at the first welcome screen and confirm with ENTER. You will be
+presented with a black screen with the word "boot:". Type "text" and hit
+ENTER. Now continue with the installation in text mode.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -138,7 +229,7 @@ d'altres.</para>
 
       <section xml:id="kernelOptions">
         <info>
-          <title xml:id="kernelOptions-ti1">Opcions del nucli</title>
+          <title xml:id="kernelOptions-ti1">RAM problem</title>
         </info>
 
         <para>Això rarament serà necessari, però en alguns casos pot ser que l'informe de
@@ -147,6 +238,18 @@ manualment, podeu fer servir el paràmetre <code>mem=xxxM</code>, on xxx és
 la quantitat correcta de RAM. Per exemple, <code>mem=256M</code>
 significaria 256MB de 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