Update Spanish files

1 files changed, 209 insertions, 1 deletions

diff --git a/es/setupBootloader.html b/es/setupBootloader.html
index 8e51b32..5ed2a4b 100644
--- a/es/setupBootloader.html
+++ b/es/setupBootloader.html
@@ -29,11 +29,19 @@
            
          
            
+<<<<<<< HEAD
+         <div class="section" title="Interfaz del cargador de arranque">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="d5e877"></a>Interfaz del cargador de arranque
+=======
          <div class="section" title="Bootloader interface">
             <div class="titlepage">
                <div>
                   <div>
                      <h3 class="title"><a name="d5e880"></a>Bootloader interface
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -41,19 +49,31 @@
                 
             
                 
+<<<<<<< HEAD
+            <p>Por defecto, Mageia usa exclusivamente:</p>
+=======
             <p>By default, Mageia uses exclusively:</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
                   <li class="listitem">
                              
+<<<<<<< HEAD
+                     <p>Grub2 (con o sin men&uacute; gr&aacute;fico) para sistemas Legacy/MBR o Legacy/GPT</p>
+=======
                      <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            
                   </li>
                   <li class="listitem">
                              
+<<<<<<< HEAD
+                     <p>Grub2-efi para un sistema UEFI.</p>
+=======
                      <p>Grub2-efi for a UEFI system.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            
                   </li>
                </ul>
@@ -69,7 +89,7 @@
                   <tr>
                      <td align="left" valign="top">
                               
-                        <p>Los men&uacute;s gr&aacute;ficos de Mageia son agradables:</p>
+                        <p>Los men&uacute;s gr&aacute;ficos de Mageia son buenos y bonitos :)</p>
                             
                      </td>
                   </tr>
@@ -77,11 +97,19 @@
             </div>
             
                 
+<<<<<<< HEAD
+            <div class="section" title="Grub2 en sistemas Legacy/MBR y Legacy/GPT">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h4 class="title"><a name="d5e887"></a>Grub2 en sistemas Legacy/MBR y Legacy/GPT
+=======
             <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
                <div class="titlepage">
                   <div>
                      <div>
                         <h4 class="title"><a name="d5e890"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -98,11 +126,19 @@
             </div>
             
                 
+<<<<<<< HEAD
+            <div class="section" title="Grub2-efi en sistemas UEFI">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h4 class="title"><a name="d5e893"></a>Grub2-efi en sistemas UEFI
+=======
             <div class="section" title="Grub2-efi on UEFI systems">
                <div class="titlepage">
                   <div>
                      <div>
                         <h4 class="title"><a name="d5e896"></a>Grub2-efi on UEFI systems
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -110,13 +146,27 @@
                      
                
                      
+<<<<<<< HEAD
+               <p>Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya que
+                  no se puede elegir entre con o sin men&uacute; gr&aacute;fico
+=======
                <p>With an UEFI system, the user interface is slightly different as you cannot
                   choose between with or without graphical menu
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                </p>
                
                      
                
                      
+<<<<<<< HEAD
+               <p>Si Mageia es el &uacute;nico sistema instalado en su computadora, el instalador
+                  crear&aacute; una ESP (EFI System Partition) para instalar el gestor de arranque
+                  (Grub2-efi). Si ya hay sistemas operativos UEFI instalados en su computadora
+                  (Windows 8 por ejemplo), el instalador de Mageia detecta el ESP existente
+                  creado por Windows y agrega grub2-efi. Aunque es posible tener varios ESP,
+                  solo uno es aconsejable y suficiente sea cual sea el n&uacute;mero de sistemas
+                  operativos que tenga.
+=======
                <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
@@ -124,6 +174,7 @@
                   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.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                </p>
                
                      
@@ -140,7 +191,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e901"></a>Usando el cargador de arranque de Mageia
+=======
                      <h3 class="title"><a name="d5e904"></a>Usando el cargador de arranque de Mageia
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -148,31 +203,52 @@
                 
             
                 
+<<<<<<< HEAD
+            <p>Por defecto, seg&uacute;n su sistema, Mageia escribe un nuevo:</p>
+=======
             <p>By default, according to your system, Mageia writes a new:</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
                   <li class="listitem">
                              
+<<<<<<< HEAD
+                     <p>GRUB2 en el MBR (Master Boot Record) de su primer disco duro o en la
+                        partici&oacute;n de arranque del BIOS.
+=======
                      <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
                         drive or in the BIOS boot partition.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </p>
                            
                   </li>
                   <li class="listitem">
                              
+<<<<<<< HEAD
+                     <p>Cargador de arranque Grub2-efi en el ESP</p>
+=======
                      <p>Grub2-efi bootloader into the ESP</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            
                   </li>
                </ul>
             </div>
             
                 
+<<<<<<< HEAD
+            <p>Si ya tiene instalados otros sistemas operativos, Mageia intentar&aacute;
+               agregarlos al nuevo men&uacute; de inicio de Mageia. Si no desea este
+               comportamiento, haga clic en <span class="guibutton">Siguiente</span> y, a
+               continuaci&oacute;n, desmarque la casilla <span class="guilabel">Sondear otros sistemas
+                  operativos</span></p>
+=======
             <p>If you already have other operating systems installed, Mageia attempts to
                add them to your new Mageia boot menu. If you don't want this behaviour,
                click on <span class="guibutton">Next</span> and then uncheck the box
                <span class="guilabel">Probe Foreign OS</span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             
                 
               
@@ -183,7 +259,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e915"></a>Usando un cargador de arranque existente
+=======
                      <h3 class="title"><a name="d5e918"></a>Usando un cargador de arranque existente
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -201,11 +281,19 @@
          </div>
          
            
+<<<<<<< HEAD
+         <div class="section" title="Carga en uso">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="d5e918"></a>Carga en uso
+=======
          <div class="section" title="Using chain loading">
             <div class="titlepage">
                <div>
                   <div>
                      <h3 class="title"><a name="d5e921"></a>Using chain loading
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -213,17 +301,29 @@
                 
             
                 
+<<<<<<< HEAD
+            <p>Si no desea un arranque de Mageia, sino que inicie desde otro SO, haga clic
+               en <span class="guibutton">Siguiente</span>, luego en
+               <span class="guibutton">Avanzado</span> y marque la casilla <span class="guilabel">No toque ESP o
+                  MBR</span>.
+=======
             <p>If you don't want a bootable Mageia, but to chain load it from another OS,
                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>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
             
                 
+<<<<<<< HEAD
+            <p>Obtendr&aacute; una advertencia de que falta el cargador de arranque, ign&oacute;relo
+               haciendo clic en <span class="guibutton">Aceptar</span>.
+=======
             <p>You will get a warning that the bootloader is missing, ignore it by clicking
                <span class="guibutton">OK</span>.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
@@ -235,7 +335,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e932"></a>Opciones
+=======
                      <h3 class="title"><a name="d5e935"></a>Opciones
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -243,11 +347,19 @@
                 
             
                 
+<<<<<<< HEAD
+            <div class="section" title="Primera p&aacute;gina">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h4 class="title"><a name="d5e934"></a>Primera p&aacute;gina
+=======
             <div class="section" title="First page">
                <div class="titlepage">
                   <div>
                      <div>
                         <h4 class="title"><a name="d5e937"></a>First page
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -259,72 +371,128 @@
                   <ul class="itemizedlist">
                      <li class="listitem">
                                     
+<<<<<<< HEAD
+                        <p><span class="guilabel">Retardo antes de arrancar la imagen predeterminada</span>:
+                           Este cuadro de texto le permite establecer un retraso en segundos antes de
+                           que se inicie el sistema operativo predeterminado.
+=======
                         <p><span class="guilabel">Delay before booting the default image</span>: This text box
                            lets you set a delay in seconds before the default operating system is
                            started up.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                                   
                      </li>
                      <li class="listitem">
                                     
+<<<<<<< HEAD
+                        <p><span class="guilabel">Seguridad</span>: Permite establecer una contrase&ntilde;a para el
+                           gestor de arranque. Esto significa que se le pedir&aacute; un nombre de usuario y
+                           una contrase&ntilde;a durante el arranque para seleccionar una entrada de inicio o
+                           cambiar la configuraci&oacute;n. El nombre de usuario es "root" y la contrase&ntilde;a es
+                           la elegida aqu&iacute; despu&eacute;s.
+=======
                         <p><span class="guilabel">Security</span>: This allows you to set a password for the
                            bootloader. This means other people can not enter single user mode or change
                            settings at the boot time.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                                   
                      </li>
                      <li class="listitem">
                                     
+<<<<<<< HEAD
+                        <p><span class="guilabel">Contrase&ntilde;a</span>: este cuadro de texto es donde se pone la
+                           contrase&ntilde;a
+=======
                         <p><span class="guilabel">Password</span>: This text box is where you actually put the
                            password
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                                   
                      </li>
                      <li class="listitem">
                                     
+<<<<<<< HEAD
+                        <p><span class="guilabel">Contrase&ntilde;a (de nuevo)</span>: vuelva a escribir la contrase&ntilde;a
+                           y Drakx comprobar&aacute; que coincide con la que se ha definido anteriormente.
+=======
                         <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will
                            check that it matches with the one set above.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                                   
                      </li>
                      <li class="listitem">
                                     
+<<<<<<< HEAD
+                        <p><span class="guilabel">Avanzado</span></p>
+=======
                         <p><span class="guilabel">Advanced</span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         
                                     
                         <div class="itemizedlist">
                            <ul class="itemizedlist">
                               <li class="listitem">
                                                  
+<<<<<<< HEAD
+                                 <p><span class="guilabel">Habilitar ACPI:</span> ACPI (Advanced Configuration and Power
+                                    Interface) es un est&aacute;ndar para la administraci&oacute;n de energ&iacute;a. Se puede
+                                    ahorrar energ&iacute;a al detener los dispositivos no utilizados, este fue el
+                                    m&eacute;todo utilizado antes de APM. Desmarcarlo podr&iacute;a ser &uacute;til si, por ejemplo,
+                                    su equipo no admite ACPI o si cree que la implementaci&oacute;n de ACPI podr&iacute;a
+                                    causar algunos problemas (por ejemplo, reinicios aleatorios o bloqueos del
+                                    sistema).
+=======
                                  <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
                                     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).
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
                               <li class="listitem">
                                                  
+<<<<<<< HEAD
+                                 <p><span class="guilabel">Habilitar SMP</span>: esta opci&oacute;n habilita / deshabilita el
+                                    multiprocesamiento sim&eacute;trico para procesadores multi-n&uacute;cleo.
+=======
                                  <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
                                     multiprocessing for multi core processors.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
                               <li class="listitem">
                                                  
+<<<<<<< HEAD
+                                 <p><span class="guilabel">Habilitar APIC</span>: Activar o desactivar esta opci&oacute;n le
+                                    permite al sistema operativo acceder al Controlador de interrupci&oacute;n
+                                    programable avanzado. Los dispositivos APIC permiten modelos de prioridad
+                                    m&aacute;s complejos y la gesti&oacute;n avanzada de IRQ (Solicitud de interrupci&oacute;n).
+=======
                                  <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the
                                     operating system access to the Advanced Programmable Interrupt
                                     Controller. APIC devices permit more complex priority models, and Advanced
                                     IRQ (Interrupt Request)  management.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
                               <li class="listitem">
                                                  
+<<<<<<< HEAD
+                                 <p><span class="guilabel">Habilitar APIC local</span>: Aqu&iacute; puede establecer APIC local,
+                                    que administra todas las interrupciones externas para un procesador
+                                    espec&iacute;fico en un sistema SMP.
+=======
                                  <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
                                     manages all external interrupts for a specific processor in an SMP system.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
@@ -338,11 +506,19 @@
             </div>
             
                 
+<<<<<<< HEAD
+            <div class="section" title="P&aacute;gina siguiente">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h4 class="title"><a name="d5e966"></a>P&aacute;gina siguiente
+=======
             <div class="section" title="Next page">
                <div class="titlepage">
                   <div>
                      <div>
                         <h4 class="title"><a name="d5e969"></a>Next page
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -354,38 +530,70 @@
                   <ul class="itemizedlist">
                      <li class="listitem">
                                   
+<<<<<<< HEAD
+                        <p><span class="guilabel">Predeterminado:</span> Sistema operativo iniciado de forma
+                           predeterminada
+=======
                         <p><span class="guilabel">Default:</span> Operating system started up by default
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                                 
                      </li>
                      <li class="listitem">
                                   
+<<<<<<< HEAD
+                        <p><span class="guilabel">A&ntilde;adir:</span> Esta opci&oacute;n le permite pasar la informaci&oacute;n del
+                           kernel o decirle al n&uacute;cleo que le proporcione m&aacute;s informaci&oacute;n a medida que
+                           arranca.
+=======
                         <p><span class="guilabel">Append:</span> This option lets you pass the kernel
                            information or tell the kernel to give you more information as it boots.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </p>
                                 
                      </li>
                      <li class="listitem">
                                   
+<<<<<<< HEAD
+                        <p><span class="guilabel">Detecci&oacute;n de otros sistemas operativos</span>: ver arriba
+                           <a class="link" href="setupBootloader.html#setupMageiaBootloader"> Utilizar un gestor de arranque Mageia
+                              </a></p>
+=======
                         <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                 
                      </li>
                      <li class="listitem">
                                   
+<<<<<<< HEAD
+                        <p><span class="guilabel">Avanzado</span></p>
+=======
                         <p><span class="guilabel">Advanced</span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         <div class="itemizedlist">
                            <ul class="itemizedlist">
                               <li class="listitem">
                                                  
+<<<<<<< HEAD
+                                 <p><span class="guilabel">Modo de video:</span> Define el tama&ntilde;o de la pantalla y la
+                                    profundidad de color que utilizar&aacute; el men&uacute; de arranque. Si hace clic en el
+                                    tri&aacute;ngulo hacia abajo, se le ofrecer&aacute;n otras opciones de tama&ntilde;o y
+                                    profundidad de color.
+=======
                                  <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth
                                     the boot menu will use. If you click the down triangle you will be offered
                                     other size and colour depth options.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                  </p>
                                                
                               </li>
                               <li class="listitem">
                                                  
+<<<<<<< HEAD
+                                 <p><span class="bold"><strong>No toque ESP o MBR</strong></span>: ver arriba <a class="link" href="setupBootloader.html#setupChainLoading">Uso de la cadena de arranque</a></p>
+=======
                                  <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                                
                               </li>
                            </ul>