Update translations

1 files changed, 0 insertions, 172 deletions

diff --git a/hu/setupBootloader.html b/hu/setupBootloader.html
index c27bf13..f320489 100644
--- a/hu/setupBootloader.html
+++ b/hu/setupBootloader.html
@@ -29,21 +29,11 @@
            
          
            
-<<<<<<< HEAD
          <div class="section" title="Bootloader interface">
             <div class="titlepage">
                <div>
                   <div>
                      <h3 class="title"><a name="d5e886"></a>Bootloader interface
-=======
-         
-           
-         <div class="section" title="With a Bios system">
-            <div class="titlepage">
-               <div>
-                  <div>
-                     <h3 class="title"><a name="d5e899"></a>With a Bios system
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -51,7 +41,6 @@
                 
             
                 
-<<<<<<< HEAD
             <p>By default, Mageia uses exclusively:</p>
             
                 
@@ -69,17 +58,6 @@
                   </li>
                </ul>
             </div>
-=======
-            <p><a name="setupBootloader-pa1"></a>If you prefer different bootloader settings to those chosen automatically by
-               the installer, you can change them here.
-            </p>
-            
-                
-            <p><a name="setupBootloader-pa2"></a>You may already have another operating system on your machine, in which case
-               you need to decide whether to add Mageia to your existing bootloader, or
-               allow Mageia to create a new one.
-            </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             
                 
             <div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -99,19 +77,11 @@
             </div>
             
                 
-<<<<<<< HEAD
             <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
                <div class="titlepage">
                   <div>
                      <div>
                         <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
-=======
-            <div class="section" title="Using a Mageia bootloader">
-               <div class="titlepage">
-                  <div>
-                     <div>
-                        <h4 class="title"><a name="usingMageiaBootloader"></a>Using a Mageia bootloader
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -119,64 +89,18 @@
                      
                
                      
-<<<<<<< HEAD
                
                      
                <p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
-=======
-               <p><a name="setupBootloader-pa4"></a>By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
-                  (Master Boot Record)  of your first hard drive. If you already have other
-                  operating systems installed, Mageia attempts to add them to your new Mageia
-                  boot menu.
-               </p>
-               
-                     
-               <p>Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
-                  legacy and Lilo.
-               </p>
-               
-                     
-               <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
-                  <table border="0" summary="Warning">
-                     <tr>
-                        <td rowspan="2" align="center" valign="top" width="25"><img alt="[Figyelem]" src="warning.png"></td>
-                        <th align="left"></th>
-                     </tr>
-                     <tr>
-                        <td align="left" valign="top">
-                                   
-                           <p><a name="setupBootloader-pa6"></a>Linux systems which use the GRUB2 bootloader are not currently supported by
-                              GRUB (legacy)  and will not be recognized if the default GRUB bootloader is
-                              used.
-                           </p>
-                           
-                                   
-                           <p>The best solution here is to use the GRUB2 bootloader which is available at
-                              the Summary page during installation.
-                           </p>
-                                 
-                        </td>
-                     </tr>
-                  </table>
-               </div>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                    
             </div>
             
                 
-<<<<<<< HEAD
             <div class="section" title="Grub2-efi on UEFI systems">
                <div class="titlepage">
                   <div>
                      <div>
                         <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
-=======
-            <div class="section" title="Using an existing bootloader">
-               <div class="titlepage">
-                  <div>
-                     <div>
-                        <h4 class="title"><a name="usingExistingBootloader"></a>Using an existing bootloader
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
@@ -184,7 +108,6 @@
                      
                
                      
-<<<<<<< HEAD
                <p>With an UEFI system, the user interface is slightly different as you cannot
                   choose between with or without graphical menu
                </p>
@@ -270,91 +193,15 @@
                add it automatically. See the documentation for the operating system in
                question.
             </p>
-=======
-               <p><a name="setupBootloader-pa46"></a>If you decide to use an existing bootloader then you will need to remember
-                  to STOP at the summary page during the installation and click the Bootloader
-                  <span class="guibutton">Configure</span> button, which will allow you to change the
-                  bootloader install location.
-               </p>
-               
-                     
-               <p><a name="setupBootloader-pa47"></a>Do not select a device e.g."sda", or you will overwrite your existing
-                  MBR. You must select the root partition that you chose during the
-                  partitioning phase earlier, e.g. sda7.
-               </p>
-               
-                     
-               <p><a name="setupBootloader-pa48"></a>To be clear, sda is a device, sda7 is a partition on that device.
-               </p>
-               
-                     
-               <div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;">
-                  <table border="0" summary="Tip">
-                     <tr>
-                        <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tipp]" src="tip.png"></td>
-                        <th align="left"></th>
-                     </tr>
-                     <tr>
-                        <td align="left" valign="top">
-                                   
-                           <p><a name="setupBootloader-pa48a"></a>Go to tty2 with Ctrl+Alt+F2 and type <code class="literal">df</code> to check where
-                              your <code class="literal">/</code> (root) partition is. Ctrl+Alt+F7 takes you back to
-                              the installer screen.
-                           </p>
-                                 
-                        </td>
-                     </tr>
-                  </table>
-               </div>
-               
-                     
-               <p><a name="setupBootloader-pa49"></a>The exact procedure for adding your Mageia system to an existing bootloader
-                  is beyond the scope of this help, however in most cases it will involve
-                  running the relevant bootloader installation program which should detect and
-                  add it automatically. See the documentation for the operating system in
-                  question.
-               </p>
-                   
-            </div>
-            
-                
-            <div class="section" title="Bootloader advanced option">
-               <div class="titlepage">
-                  <div>
-                     <div>
-                        <h4 class="title"><a name="advancedOptionBootloader"></a>Bootloader advanced option
-                        </h4>
-                     </div>
-                  </div>
-               </div>
-                     
-               
-                     
-               <p><a name="setupBootloader-pa52"></a>If you have very limited disk space for the <code class="literal">/</code> partition
-                  that contains <code class="literal">/tmp</code>, click on
-                  <span class="guibutton">Advanced</span> and check the box for <span class="guilabel">Clean /tmp
-                     at each boot</span>. This helps to maintain some free space.
-               </p>
-                   
-            </div>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
               
          </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="With an UEFI system">
-            <div class="titlepage">
-               <div>
-                  <div>
-                     <h3 class="title"><a name="d5e936"></a>With an UEFI system
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -362,21 +209,15 @@
                 
             
                 
-<<<<<<< HEAD
             <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>.
-=======
-            <p>With an UEFI system, the user interface is slightly different as you cannot
-               choose the boot loader since only Grub2-efi is available. 
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
             
                 
-<<<<<<< HEAD
             <p>You will get a warning that the bootloader is missing, ignore it by clicking
                <span class="guibutton">OK</span>.
             </p>
@@ -551,19 +392,6 @@
                </div>
                    
             </div>
-=======
-            <p>If Mageia is the first system installed on your computer, the installer
-               created an ESP (EFI System Partition) to receive the bootloader
-               (Grub2-efi). If there was already UEFI operating systems previously
-               installed on your computer (Windows 8 for example), the Mageia installer
-               detected the existing ESP created by Windows and added 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 really knowing what you do.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
               
          </div>