From a979860a232ea8759dc5e6b72074051c9f64b6f8 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 07:50:24 +0200
Subject: Update Catalan files

---
 ca/setupBootloader.html | 83 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

(limited to 'ca/setupBootloader.html')

diff --git a/ca/setupBootloader.html b/ca/setupBootloader.html
index a1ba4ad..fcdde84 100644
--- a/ca/setupBootloader.html
+++ b/ca/setupBootloader.html
@@ -33,7 +33,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e886"></a>Bootloader interface
+=======
                      <h3 class="title"><a name="d5e900"></a>Bootloader interface
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -81,7 +85,11 @@
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
+=======
                         <h4 class="title"><a name="d5e910"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -89,11 +97,17 @@
                      
                
                      
+<<<<<<< HEAD
+               
+                     
+               <p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
+=======
                
                      
                
                      
                <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                    
             </div>
             
@@ -102,7 +116,11 @@
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
+=======
                         <h4 class="title"><a name="d5e919"></a>Grub2-efi on UEFI systems
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -117,6 +135,19 @@
                      
                
                      
+<<<<<<< HEAD
+               <p>If Mageia is the only system installed on your computer, the installer
+                  created an ESP (EFI System Partition) to receive the bootloader
+                  (Grub2-efi). If there are already UEFI operating systems installed on your
+                  computer (Windows 8 for example), the Mageia installer detects the existing
+                  ESP created by Windows and adds grub2-efi. Although it is possible to have
+                  several ESPs, only one is advised and enough whatever the number of
+                  operating systems you have.
+               </p>
+               
+                     
+               <p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
+=======
                
                      
                <p>If Mageia is the first system installed on your computer, the installer
@@ -130,6 +161,7 @@
                
                      
                <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                    
             </div>
               
@@ -140,7 +172,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e910"></a>&Uacute;s del gestor d'arrencada de Mageia
+=======
                      <h3 class="title"><a name="d5e930"></a>&Uacute;s del gestor d'arrencada de Mageia
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -175,8 +211,11 @@
                <span class="guilabel">Probe Foreign OS</span></p>
             
                 
+<<<<<<< HEAD
+=======
             
                 
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
               
          </div>
          
@@ -185,7 +224,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e924"></a>&Uacute;s d'un gestor d'arrencada existent
+=======
                      <h3 class="title"><a name="d5e947"></a>&Uacute;s d'un gestor d'arrencada existent
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -203,11 +246,19 @@
          </div>
          
            
+<<<<<<< HEAD
+         <div class="section" title="Using chain loading">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="d5e927"></a>Using chain loading
+=======
          <div class="section" title="Using the chain loading">
             <div class="titlepage">
                <div>
                   <div>
                      <h3 class="title"><a name="d5e950"></a>Using the chain loading
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -215,7 +266,11 @@
                 
             
                 
+<<<<<<< HEAD
+            <p>If you don't want a bootable Mageia, but to chain load it from another OS,
+=======
             <p>If you don't want a bootable Mageia, but chain load it from another OS,
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                click on <span class="guibutton">Next</span>, then on
                <span class="guibutton">Advanced</span> and Check the box <span class="guilabel">Do not touch ESP
                   or MBR</span>.
@@ -224,10 +279,15 @@
                 
             
                 
+<<<<<<< HEAD
+            <p>You will get a warning that the bootloader is missing, ignore it by clicking
+               <span class="guibutton">OK</span>.
+=======
             
                 
             <p>You will get a warning that the bootloader will lack, ignore it by a click
                on <span class="guibutton">OK</span>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
@@ -239,7 +299,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e941"></a>Opcions
+=======
                      <h3 class="title"><a name="d5e967"></a>Opcions
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -251,7 +315,11 @@
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e943"></a>First page
+=======
                         <h4 class="title"><a name="d5e969"></a>First page
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -302,10 +370,17 @@
                                                  
                                  <p><span class="guilabel">Enable ACPI:</span> ACPI (Advanced Configuration and Power
                                     Interface) is a standard for the power management. It can save energy by
+<<<<<<< HEAD
+                                    stopping unused devices, this was the method used before APM. Unchecking it
+                                    could be useful if, for example, your computer does not support ACPI or if
+                                    you think the ACPI implementation might cause some problems (for instance
+                                    random reboots or system lockups).
+=======
                                     stopping unused devices, this was the method used before APM. Uncheck it be
                                     useful, for example, if your computer does not support ACPI or if you think
                                     the ACPI implementation might cause some problems (for instance random
                                     reboots or system lockups).
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
@@ -328,7 +403,11 @@
                               <li class="listitem">
                                                  
                                  <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
+<<<<<<< HEAD
+                                    manages all external interrupts for a specific processor in an SMP system.
+=======
                                     manage all external interrupts for some specific processor in an SMP system.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
@@ -346,7 +425,11 @@
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e975"></a>Next page
+=======
                         <h4 class="title"><a name="d5e1001"></a>Next page
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
-- 
cgit v1.2.1