Update resources + sync with Tx

5 files changed, 100 insertions, 91 deletions

diff --git a/docs/installer/ca/DrakX-cover.xml b/docs/installer/ca/DrakX-cover.xml
index e1a9ac3e..562fd7f8 100644
--- a/docs/installer/ca/DrakX-cover.xml
+++ b/docs/installer/ca/DrakX-cover.xml
@@ -6,12 +6,12 @@
    <publisher> <publishername>Mageia.org</publishername> </publisher>
    <revhistory>
      <revision>
-          <date>February 2014</date>
+          <date>Febrer 2014</date>
         <revremark>Mageia 4</revremark>
      </revision>
    </revhistory>
     <cover>
-        <para role="tagline">The Official Documentation for Mageia</para>
+        <para role="tagline">Documentació oficial de Mageia</para>
       <mediaobject>
 <imageobject> <imagedata fileref="mageia-2013.png"/> </imageobject></mediaobject>
   <info>
@@ -19,7 +19,7 @@
    <publisher> <publishername>Mageia.org</publishername> </publisher>
    <revhistory>
      <revision>
-          <date>February 2014</date>
+          <date>Febrer 2014</date>
         <revremark>Mageia 4</revremark>
      </revision>
    </revhistory>
diff --git a/docs/installer/ca/DrakX.xml b/docs/installer/ca/DrakX.xml
index e42e4502..bd0eb092 100644
--- a/docs/installer/ca/DrakX.xml
+++ b/docs/installer/ca/DrakX.xml
@@ -18,7 +18,7 @@ manual. Les imatges que veureu dependran del vostre maquinari i de les
 decisions que aneu prenent durant la instal·lació.</para>
         </note></para>
 
-      <para>Els textos i les captures de pantalla d'aquest manual estan disponibles sota
+      <para xml:id="CC_BY-SA">Els textos i les captures de pantalla d'aquest manual estan disponibles sota
 la llicència CC BY-SA 3.0 <link
 ns6:href="http://creativecommons.org/licenses/by-sa/3.0/">http://creativecommons.org/licenses/by-sa/3.0/</link></para>
 
@@ -132,7 +132,5 @@ documentació</link>.</para>
 
   <xi:include href="exitInstall.xml"/>
 
-  
-<!--STILL TO BE WRITTEN: <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uninstall-Mageia.xml"/>
- -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="uninstall-Mageia.xml"/>
 </article>
diff --git a/docs/installer/ca/SelectAndUseISOs2.xml b/docs/installer/ca/SelectAndUseISOs2.xml
index 979ebf27..fa0aef87 100644
--- a/docs/installer/ca/SelectAndUseISOs2.xml
+++ b/docs/installer/ca/SelectAndUseISOs2.xml
@@ -11,8 +11,9 @@
     <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>Here, a medium (plural: media) is an ISO image file that allows you to
+install and/or update Mageia and by extension any physical support the ISO
+file is copied to.</para>
 
       <para>You can find them <link
 ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
@@ -26,7 +27,7 @@ ns4:href="http://www.mageia.org/en/downloads/">here</link>.</para>
 
         <itemizedlist>
           <listitem>
-            <para>They use the traditional installer called drakx.</para>
+            <para>These ISOs use the traditional installer called drakx.</para>
           </listitem>
 
           <listitem>
@@ -49,12 +50,11 @@ Hardware Detection Tool.</para>
           </listitem>
 
           <listitem>
-            <para>Each DVD contains any available desktop environments and languages.</para>
+            <para>Each DVD contains many 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>
+            <para>You'll be given the choice during the installation to add non free software.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -64,17 +64,17 @@ software.</para>
 
         <itemizedlist>
           <listitem>
-            <para>Both architectures are present on the same media, the choice is made
+            <para>Both architectures are present on the same medium, the choice is made
 automatically according to the detected CPU.</para>
           </listitem>
 
           <listitem>
-            <para>Xfce desktop only.</para>
+            <para>Uses 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>
+            <para>Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl,
+pt, ru, sv, uk) TO BE CHECKED!</para>
           </listitem>
 
           <listitem>
@@ -92,16 +92,17 @@ TO BE CHECKED!</para>
 
         <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>
+            <para>Can be used to preview the distribution without installing it on a HDD, and
+optionally install Mageia on to your HDD.
+            </para>
           </listitem>
 
           <listitem>
-            <para>ISO contains only one desktop environment (KDE or GNOME).</para>
+            <para>Each ISO contains only one desktop environment (KDE or GNOME).</para>
           </listitem>
 
           <listitem>
-            <para>Different media for architecture 32 or 64 bits.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
 
           <listitem>
@@ -111,7 +112,7 @@ releases.</emphasis></para>
           </listitem>
 
           <listitem>
-            <para>They contains non free software.</para>
+            <para>They contain non free software.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -129,7 +130,7 @@ releases.</emphasis></para>
           </listitem>
 
           <listitem>
-            <para>32 bits only.</para>
+            <para>32 bit only.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -147,7 +148,7 @@ releases.</emphasis></para>
           </listitem>
 
           <listitem>
-            <para>32 bits only.</para>
+            <para>32 bit only.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -165,7 +166,7 @@ releases.</emphasis></para>
           </listitem>
 
           <listitem>
-            <para>Different media for architecture 32 or 64 bits.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -183,14 +184,14 @@ releases.</emphasis></para>
           </listitem>
 
           <listitem>
-            <para>Different media for architecture 32 or 64 bits.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
         </itemizedlist>
       </section>
     </section>
 
     <section>
-      <title>Boot-only CDs media</title>
+      <title>Boot-only CD media</title>
 
       <section>
         <title>Common features</title>
@@ -198,19 +199,20 @@ releases.</emphasis></para>
         <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>
+start the drakx installer and find drakx-installer-stage2 and other packages
+that are needed to continue and complete the install. These packages 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>
+            <para>These media are very light (less than 100 MB) and are convenient when
+bandwidth is too low to download a full DVD, a PC without a DVD drive or a
+PC that can't boot from a USB stick.</para>
           </listitem>
 
           <listitem>
-            <para>Different media for architecture 32 or 64 bits.</para>
+            <para>Different media for 32 or 64 bit architectures.</para>
           </listitem>
 
           <listitem>
@@ -224,7 +226,8 @@ can't boot on a USB stick.</para>
 
         <itemizedlist>
           <listitem>
-            <para>Contains only free software, for people who refuse non free software.</para>
+            <para>Contains only free software, for those people who refuse to use non-free
+software.</para>
           </listitem>
         </itemizedlist>
       </section>
@@ -234,7 +237,7 @@ can't boot on a USB stick.</para>
 
         <itemizedlist>
           <listitem>
-            <para>Contains non free software (mostly drivers, codecs...) for people who need
+            <para>Contains non-free software (mostly drivers, codecs...) for people who need
 it.</para>
           </listitem>
         </itemizedlist>
@@ -243,26 +246,27 @@ it.</para>
   </section>
 
   <section>
-    <title>Media downloading and checking</title>
+    <title>Downloading and Checking Media</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>
+      <para>Once you have chosen your ISO file, you can download it using either http or
+BitTorrent. In both cases, a window gives you some information, such as the
+mirror in use and the possibility to change if the bandwidth is to low. If
+http is chosen, you may 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
+      <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. If you ask this algorithm to calculate again this
+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 met a
-failure. Then this window appears:</para>
+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>
 
       <mediaobject>
 <imageobject> <imagedata fileref="Download.png"/> </imageobject></mediaobject>
@@ -295,33 +299,33 @@ while) with the number given by Mageia. Example:</para>
   <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>
+    <para>The checked ISO can now be burned to a CD or DVD or dumped to a USB
+stick. These operations are not a simple copy and aim to make a boot-able
+medium.</para>
 
     <section>
-      <title>Burn the ISO on a CD/DVD</title>
+      <title>Burning the ISO to a CD/DVD</title>
 
-      <para>Use whatever burner you want but ensure the burning device is set correctly
+      <para>Use whatever burner you wish 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
+correct.  There is 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>
+      <title>Dump the ISO to 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>
+      <para>All Mageia ISOs are hybrids, which means you can 'dump' them to a USB stick
+and then 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>
+        <para>"dumping" an image onto a flash device destroys any previous file-system on
+the device; any other data will be lost and the 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>
+      <para>To recover the original capacity, you must re-format the USB stick.</para>
 
       <section>
         <title>Using Mageia</title>
@@ -338,7 +342,7 @@ ns4:href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks"
 
           <listitem>
             <para>Become root with the command <userinput>su -</userinput> (don't forget the
-final -)</para>
+final '-' )</para>
 
             <mediaobject>
 <imageobject> <imagedata fileref="Root.png" contentwidth="650"/>
@@ -346,8 +350,8 @@ final -)</para>
           </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>
+            <para>Plug your USB stick (do not mount it, this also means do not open any
+application or file manager that could access or read it)</para>
           </listitem>
 
           <listitem>
@@ -367,9 +371,9 @@ in the screenshot above, it is a 8Go USB stick.</para>
             <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>
+            <para>Where X=your device name eg: /dev/sdc</para>
+            <para> Example: # <userinput>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
+of=/dev/sdb bs=1M</userinput></para>
           </listitem>
 
           <listitem>
@@ -385,7 +389,7 @@ bs=1M</userinput></para>
       <section>
         <title>Using Windows</title>
 
-        <para>You can try:</para>
+        <para>You could try:</para>
 
         <para>- <link ns4:href="http://rufus.akeo.ie/?locale=en_US">Rufus</link></para>
 
@@ -403,9 +407,9 @@ Disk Imager</link></para>
     <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
+    <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
+</section>
diff --git a/docs/installer/ca/installer.xml b/docs/installer/ca/installer.xml
index 9ba8ffe8..fcc8f723 100644
--- a/docs/installer/ca/installer.xml
+++ b/docs/installer/ca/installer.xml
@@ -41,13 +41,15 @@ predeterminada engegarà l'instal·lador, que normalment és tot el que cal.</pa
       <title xml:id="installer-ti2">Pantalla de benvinguda de la instal·lació</title>
     </info>
 
-    <para>Here is the default welcome screen when using a Mageia DVD:</para>
+    <para>Aquesta és la pantalla de benvinguda per defecte quan s'utilitza un DVD
+Mageia:</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>
+  <para>A partir d'aquesta primera pantalla, és possible establir algunes
+preferències personals:</para>
 
   <itemizedlist>
     <listitem>
diff --git a/docs/installer/ca/setupBootloaderAddEntry.xml b/docs/installer/ca/setupBootloaderAddEntry.xml
index 1dfd6655..ef6744c9 100644
--- a/docs/installer/ca/setupBootloaderAddEntry.xml
+++ b/docs/installer/ca/setupBootloaderAddEntry.xml
@@ -1,35 +1,40 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version='1.0' encoding='utf-8'?><section xmlns="http://docbook.org/ns/docbook" xmlns:ns5="http://www.w3.org/2000/svg" xmlns:ns4="http://www.w3.org/1999/xhtml" xmlns:ns3="http://www.w3.org/1998/Math/MathML" xmlns:ns2="http://www.w3.org/1999/xlink" xmlns:ns="http://docbook.org/ns/docbook" xml:id="setupBootloaderAddEntry" version="5.0" xml:lang="ca">
+  <info>
+    <title xml:id="setupBootloaderAddEntry-ti1">Afegeix o modifica una entrada al menú d'arrencada</title>
+  </info>
 
-
-
-<section xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="ca" xml:id="setupBootloaderAddEntry"><info><title xml:id="setupBootloaderAddEntry-ti1">Afegeix o modifica una entrada al menú d'arrencada</title></info>
-
-	
-
- <mediaobject>
+  <mediaobject>
 <imageobject> <imagedata revision="1"
-fileref="dx2-bootloaderConfiguration.png" format="PNG" align="center"
-xml:id="bootloaderConfiguration-im1"></imagedata> </imageobject></mediaobject>
-  
-  
-  
+fileref="dx2-bootloaderConfiguration.png" align="center" format="PNG"
+xml:id="bootloaderConfiguration-im1"/> </imageobject></mediaobject>
+
   <para>Podeu afegir una entrada o modificar la que heu triat, prement el botó
 adequat a la pantalla de <emphasis>Configuració de l'arrencada</emphasis> i
 editant la pantalla que hi apareix.</para>
 
-  
- <mediaobject>
-<imageobject> <imagedata revision="1"
-fileref="dx2-setupBootloaderAddEntry.png" format="PNG" align="center"
-xml:id="setupBootloaderAddEntry-im1"></imagedata> </imageobject></mediaobject>
-  
+  <note>
+    <para>If you have chosen <code>Grub 2</code> as your bootloader, you cannot use
+this tool to edit entries at this step, press 'Next'. You need to manually
+edit <code>/boot/grub2/custom.cfg</code> or use <code>grub-customizer</code>
+instead.</para>
+  </note>
+
+  <mediaobject>
+<imageobject> <imagedata revision="1" xml:id="setupBootloaderAddEntry-im1"
+align="center" format="PNG" fileref="dx2-setupBootloaderAddEntry.png"/>
+</imageobject></mediaobject>
+
   <para>Algunes coses que es poden fer sense perill són canviar l'etiqueta d'una
 entrada i marcar la casella per a fer-la predeterminada.</para>
+
   <para>Podeu afegir el número de versió d'una entrada, o bé reanomenar-la
 completament.</para>
+
   <para>L'entrada predeterminada és aquella que es farà servir si no es fa cap
 selecció mentre el sistema està arrencant.</para>
-<warning><para>L'edició d'altres coses us pot deixar amb un sistema que no pot arrencar. No
-proveu altres coses si no sabeu què esteu fent.</para></warning>
 
-  </section>
+  <warning>
+    <para>L'edició d'altres coses us pot deixar amb un sistema que no pot arrencar. No
+proveu altres coses si no sabeu què esteu fent.</para>
+  </warning>
+</section>
\ No newline at end of file