1 files changed, 10 insertions, 22 deletions
diff --git a/ca/index.html b/ca/index.html
index 42a49cc..47dc85b 100644
--- a/ca/index.html
+++ b/ca/index.html
@@ -28,8 +28,8 @@
                   <dl>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducci&oacute;</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Suport</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Baixada i comprovaci&oacute; del mitj&agrave;</a></span></dt>
-                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Enregistrament o bolcat de l'ISO</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Baixada i comprovaci&oacute; del mitj&agrave;</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Enregistrament o bolcat de l'ISO</a></span></dt>
                   </dl>
                </dd>
                <dt><span class="section"><a href="installer.html">DrakX, l'instal&middot;lador de Mageia</a></span></dt>
@@ -50,10 +50,10 @@
                <dt><span class="section"><a href="setupSCSI.html">Configuraci&oacute; SCSI</a></span></dt>
                <dt><span class="section"><a href="selectInstallClass.html">Instal&middot;laci&oacute; o actualitzaci&oacute;</a></span></dt>
                <dt><span class="section"><a href="selectKeyboard.html">Teclat</a></span></dt>
-               <dt><span class="section"><a href="doPartitionDisks.html">Particionament</a></span></dt>
+               <dt><span class="section"><a href="doPartitionDisks.html">Particions</a></span></dt>
                <dt><span class="section"><a href="ask_mntpoint_s.html">Tria dels punts de muntatge</a></span></dt>
                <dt><span class="section"><a href="takeOverHdConfirm.html">Confirmaci&oacute; del disc dur que es formatar&agrave;</a></span></dt>
-               <dt><span class="section"><a href="diskdrake.html">Particionament personalitzat del disc amb DiskDrake</a></span></dt>
+               <dt><span class="section"><a href="diskdrake.html">Particions personalitzades del disc amb DiskDrake</a></span></dt>
                <dt><span class="section"><a href="formatPartitions.html">Formataci&oacute;</a></span></dt>
                <dt><span class="section"><a href="add_supplemental_media.html">Selecci&oacute; dels suports (configura suports d'instal&middot;laci&oacute; suplementaris)</a></span></dt>
                <dt><span class="section"><a href="media_selection.html">Selecci&oacute; del suport (Nonfree)</a></span></dt>
@@ -75,19 +75,11 @@
                <dt><span class="section"><a href="setupBootloader.html">Opcions principals del men&uacute; d'arrencada</a></span></dt>
                <dd>
                   <dl>
-<<<<<<< HEAD
-                     <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e910">&Uacute;s del gestor d'arrencada de Mageia</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e924">&Uacute;s d'un gestor d'arrencada existent</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e927">Using chain loading</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e941">Opcions</a></span></dt>
-=======
-                     <dt><span class="section"><a href="setupBootloader.html#d5e900">Bootloader interface</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e930">&Uacute;s del gestor d'arrencada de Mageia</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e947">&Uacute;s d'un gestor d'arrencada existent</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e950">Using the chain loading</a></span></dt>
-                     <dt><span class="section"><a href="setupBootloader.html#d5e967">Opcions</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+                     <dt><span class="section"><a href="setupBootloader.html#d5e883">Bootloader interface</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e907">&Uacute;s del gestor d'arrencada de Mageia</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e921">&Uacute;s d'un gestor d'arrencada existent</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e924">Using chain loading</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e938">Opcions</a></span></dt>
                   </dl>
                </dd>
                <dt><span class="section"><a href="setupBootloaderAddEntry.html">Addici&oacute; o modificaci&oacute; d'una entrada al men&uacute; d'arrencada</a></span></dt>
@@ -121,11 +113,7 @@
                <dt><span class="section"><a href="uninstall-Mageia.html">Desinstal&middot;laci&oacute; de Mageia</a></span></dt>
                <dd>
                   <dl>
-<<<<<<< HEAD
-                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Howto</a></span></dt>
-=======
-                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1273">Howto</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+                     <dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Howto</a></span></dt>
                   </dl>
                </dd>
             </dl>