Update translations

1 files changed, 85 insertions, 37 deletions

diff --git a/docs/installer/ca/SelectAndUseISOs2.xml b/docs/installer/ca/SelectAndUseISOs2.xml
index 10b5ed21..c3b4f6f2 100644
--- a/docs/installer/ca/SelectAndUseISOs2.xml
+++ b/docs/installer/ca/SelectAndUseISOs2.xml
@@ -7,6 +7,32 @@
   </info>
 
   <section>
+    <title>Introducció</title>
+
+    <para>Mageia is distributed via ISO images. This page will help you to choose
+which image match your needs.</para>
+
+    <para>There is two families of media:</para>
+
+    <itemizedlist>
+      <listitem>
+        <para>Classical installer: After booting the media, it will follow a process
+allowing to choose what to install and how to configure your target
+system. This give you the maximal flexibility for a customized installation,
+in particular to choose which Desktop Environment you will install.</para>
+      </listitem>
+
+      <listitem>
+        <para>LIVE media: you can boot the media in a real Mageia system without
+installing it, to see what you will get after installation.  The
+installation process is simpler, but you get lesser choices.</para>
+      </listitem>
+    </itemizedlist>
+
+    <para>Details are given in the next sections.</para>
+  </section>
+
+  <section>
     <title>Suport</title>
 
     <section>
@@ -263,12 +289,8 @@ http is chosen, you may also see something like</para>
 <imageobject> <imagedata fileref="Checking.png"/> </imageobject></mediaobject>
 
       <para>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
-them. Both hexadecimal numbers have been calculated by an algorithm from the
-file to be downloaded. When you ask these algorithms to recalculate 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 have a
-failure. A failure infers that you should retry the download.Then this
-window appears:</para>
+them. Keep one of them <link linkend="integrity">for further
+usage</link>. Then this window appears:</para>
 
       <mediaobject>
 <imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -277,7 +299,13 @@ window appears:</para>
     </section>
 
     <section>
-      <title>Comprovació de la integritat del suport baixat</title>
+      <title xml:id="integrity">Comprovació de la integritat del suport baixat</title>
+
+      <para>Both checksums are hexadecimal numbers calculated by an algorithm from the
+file to be downloaded. When you ask these algorithms to recalculate 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 have a
+failure. A failure infers that you should retry the download.</para>
 
       <para>Obriu una consola, no cal que sigueu l'usuari primari, i:</para>
 
@@ -327,14 +355,35 @@ the device; any other data will be lost and the partition capacity will be
 reduced to the image size.</para>
       </warning>
 
-      <para>Per a recuperar la capacitat original heu de reformatar el llapis de memòria
-USB.</para>
+      <para>To recover the original capacity, you must redo partitioning and re-format
+the USB stick.</para>
 
       <section>
-        <title>Des de Mageia</title>
+        <title>Using a graphical tool within 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>
+      </section>
+
+      <section>
+        <title>Using a graphical tool within Windows</title>
+
+        <para>Podeu provar:</para>
+
+        <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link> using the
+"ISO image" option;</para>
+
+        <para>- <link ns4:href="http://sourceforge.net/projects/win32diskimager">Win32
+Disk Imager</link></para>
+      </section>
+
+      <section>
+        <title>Using Command line within a GNU/Linux system</title>
+
+        <warning>
+          <para>It is potentially *dangerous* to do this by hand. You risk to overwrite a
+disc partition if you get the device-ID wrong.</para>
+        </warning>
 
         <para>També podeu fer servir l'eina dd en una consola:</para>
 
@@ -361,11 +410,34 @@ application or file manager that could access or read it)</para>
 
             <mediaobject>
 <imageobject> <imagedata fileref="../Fdisk.png"/> </imageobject></mediaobject>
+
+            <para>Alternatively, you can get the device name with the command
+<code>dmesg</code>: at end, you see the device name starting with
+<emphasis>sd</emphasis>, and <emphasis>sdd</emphasis> in this case:</para>
+
+            <screen>[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
+[72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
+[72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
+[72594.770536] usb 1-1: Product: Mass Storage Device
+[72594.770537] usb 1-1: Manufacturer: JetFlash
+[72594.770539] usb 1-1: SerialNumber: 18MJTWLMPUCC3SSB
+[72594.770713] usb 1-1: ep 0x81 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.770719] usb 1-1: ep 0x2 - rounding interval to 128 microframes, ep desc says 255 microframes
+[72594.771122] usb-storage 1-1:1.0: USB Mass Storage device detected
+[72594.772447] scsi host8: usb-storage 1-1:1.0
+[72595.963238] scsi 8:0:0:0: Direct-Access     JetFlash Transcend 2GB    1100 PQ: 0 ANSI: 4
+[72595.963626] sd 8:0:0:0: [sdd] 4194304 512-byte logical blocks: (2.14 GB/2.00 GiB)
+[72595.964104] sd 8:0:0:0: [sdd] Write Protect is off
+[72595.964108] sd 8:0:0:0: [sdd] Mode Sense: 43 00 00 00
+[72595.965025] sd 8:0:0:0: [sdd] No Caching mode page found
+[72595.965031] sd 8:0:0:0: [sdd] Assuming drive cache: write through
+[72595.967251]  <emphasis>sdd</emphasis>: sdd1
+[72595.969446] sd 8:0:0:0: [sdd] Attached SCSI removable disk</screen>
           </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>
+            <para>Find the device name for your USB stick (by its size), for example
+<code>/dev/sdb</code> in the screenshot above, it is a 8GB USB stick.</para>
           </listitem>
 
           <listitem>
@@ -387,30 +459,6 @@ of=/dev/sdb bs=1M</userinput></para>
           </listitem>
         </orderedlist>
       </section>
-
-      <section>
-        <title>Des de Windows</title>
-
-        <para>Podeu provar:</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>Instal·lació de Mageia</title>
-
-    <para>Aquest pas es detalla a <link ns4:href="http://www.mageia.org/ca/doc/">la
-documentació de Mageia</link>.</para>
-
-    <para>Teniu més informació disponible al <link
-ns4:href="https://wiki.mageia.org/ca/Category:Documentation">wiki de
-Mageia</link>.</para>
-  </section>
-</section>
+</section>
\ No newline at end of file