From fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8 Mon Sep 17 00:00:00 2001
From: Papoteur <papoteur@mageialinux-online.org>
Date: Tue, 6 Jun 2017 07:53:28 +0200
Subject: Update Hungarian files

---
 hu/Select-and-use-ISOs.html     | 319 ++++++++++++++++++++++++++++++++++++++
 hu/acceptLicense.html           |  12 ++
 hu/addUser.html                 |  55 +++++++
 hu/chooseDesktop.html           |  23 +++
 hu/choosePackageGroups.html     |  46 ++++++
 hu/diskdrake.html               |  31 ++++
 hu/doPartitionDisks.html        |  29 ++++
 hu/exitInstall.html             |  22 +++
 hu/index.html                   |  24 +++
 hu/misc-params.html             |  79 ++++++++++
 hu/selectCountry.html           |  61 ++++++++
 hu/selectLanguage.html          |   4 +
 hu/setupBootloader.html         | 330 ++++++++++++++++++++++++++++++++++++++++
 hu/setupBootloaderAddEntry.html |  22 +++
 hu/setupSCSI.html               |   4 +
 hu/soundConfig.html             |  23 +++
 hu/uninstall-Mageia.html        |   4 +
 17 files changed, 1088 insertions(+)

(limited to 'hu')

diff --git a/hu/Select-and-use-ISOs.html b/hu/Select-and-use-ISOs.html
index 8bba188..9773f33 100644
--- a/hu/Select-and-use-ISOs.html
+++ b/hu/Select-and-use-ISOs.html
@@ -23,9 +23,13 @@
             </div>
          </div>
            
+<<<<<<< HEAD
+           
+=======
          
            
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Bevezet&eacute;s">
             <div class="titlepage">
@@ -37,15 +41,23 @@
                </div>
             </div>
                 
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <p>Mageia is distributed via ISO images. This page will help you to choose
                which image match your needs.
             </p>
+<<<<<<< HEAD
+                
+            <p>There is two families of media:</p>
+=======
             
                 
             <p>There is two families of media:</p>
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
@@ -68,12 +80,18 @@
                   </li>
                </ul>
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <p>Details are given in the next sections.</p>
               
          </div>
+<<<<<<< HEAD
+=======
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Media">
             <div class="titlepage">
@@ -85,7 +103,10 @@
                </div>
             </div>
                 
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Definition">
                <div class="titlepage">
@@ -97,19 +118,28 @@
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>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.
                </p>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>You can find them <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">here</a>.
                </p>
                    
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Classical installation media">
                <div class="titlepage">
@@ -121,7 +151,10 @@
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="Common features">
                   <div class="titlepage">
@@ -133,7 +166,10 @@
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
@@ -151,7 +187,10 @@
                   </div>
                         
                </div>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="DVD">
                   <div class="titlepage">
@@ -163,13 +202,20 @@
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>Different media for 32 or 64 bit architectures.</p>
+=======
                            <p>Different media for architecture 32 or 64 bits.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                      
                         </li>
                         <li class="listitem">
@@ -193,6 +239,10 @@
                   </div>
                         
                </div>
+<<<<<<< HEAD
+                   
+            </div>
+=======
                
                      
                <div class="section" title="DVD dual arch">
@@ -240,30 +290,45 @@
                    
             </div>
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Live media">
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e56"></a>Live media
+=======
                         <h4 class="title"><a name="d5e67"></a>Live media
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="Common features">
                   <div class="titlepage">
                      <div>
                         <div>
+<<<<<<< HEAD
+                           <h5 class="title"><a name="d5e58"></a>Common features
+=======
                            <h5 class="title"><a name="d5e69"></a>Common features
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
@@ -276,7 +341,11 @@
                         </li>
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</p>
+=======
                            <p>Each ISO contains only one desktop environment (KDE or GNOME).</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                      
                         </li>
                         <li class="listitem">
@@ -300,6 +369,14 @@
                   </div>
                         
                </div>
+<<<<<<< HEAD
+                     
+               <div class="section" title="Live DVD Plasma">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h5 class="title"><a name="d5e72"></a>Live DVD Plasma
+=======
                
                      
                <div class="section" title="Live CD KDE">
@@ -307,34 +384,58 @@
                      <div>
                         <div>
                            <h5 class="title"><a name="d5e83"></a>Live CD KDE
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>Plasma desktop environment only.</p>
+=======
                            <p>KDE desktop environment only.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                      
                         </li>
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>All languages are present.</p>
+=======
                            <p>English language only.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                      
                         </li>
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>Different media for 32 or 64 bit architectures.</p>
+=======
                            <p>32 bit only.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                      
                         </li>
                      </ul>
                   </div>
                         
                </div>
+<<<<<<< HEAD
+                     
+               <div class="section" title="Live DVD GNOME">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h5 class="title"><a name="d5e81"></a>Live DVD GNOME
+=======
                
                      
                <div class="section" title="Live CD GNOME">
@@ -342,12 +443,16 @@
                      <div>
                         <div>
                            <h5 class="title"><a name="d5e92"></a>Live CD GNOME
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
@@ -358,6 +463,8 @@
                         </li>
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+=======
                            <p>English language only.</p>
                                      
                         </li>
@@ -393,6 +500,7 @@
                         </li>
                         <li class="listitem">
                                        
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            <p>All languages are present.</p>
                                      
                         </li>
@@ -405,6 +513,14 @@
                   </div>
                         
                </div>
+<<<<<<< HEAD
+                     
+               <div class="section" title="Live DVD Xfce">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h5 class="title"><a name="d5e90"></a>Live DVD Xfce
+=======
                
                      
                <div class="section" title="Live DVD GNOME">
@@ -412,18 +528,26 @@
                      <div>
                         <div>
                            <h5 class="title"><a name="d5e110"></a>Live DVD GNOME
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>Xfce desktop environment only.</p>
+=======
                            <p>GNOME desktop environment only.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                      
                         </li>
                         <li class="listitem">
@@ -442,31 +566,48 @@
                </div>
                    
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Boot-only CD media">
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e99"></a>Boot-only CD media
+=======
                         <h4 class="title"><a name="d5e119"></a>Boot-only CD media
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="Common features">
                   <div class="titlepage">
                      <div>
                         <div>
+<<<<<<< HEAD
+                           <h5 class="title"><a name="d5e101"></a>Common features
+=======
                            <h5 class="title"><a name="d5e121"></a>Common features
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
@@ -502,6 +643,14 @@
                   </div>
                         
                </div>
+<<<<<<< HEAD
+                     
+               <div class="section" title="netinstall.iso">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h5 class="title"><a name="d5e112"></a>netinstall.iso
+=======
                
                      
                <div class="section" title="boot.iso">
@@ -509,12 +658,16 @@
                      <div>
                         <div>
                            <h5 class="title"><a name="d5e132"></a>boot.iso
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
@@ -529,6 +682,14 @@
                   </div>
                         
                </div>
+<<<<<<< HEAD
+                     
+               <div class="section" title="netinstall-nonfree.iso">
+                  <div class="titlepage">
+                     <div>
+                        <div>
+                           <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
+=======
                
                      
                <div class="section" title="boot-nonfree.iso">
@@ -536,12 +697,16 @@
                      <div>
                         <div>
                            <h5 class="title"><a name="d5e137"></a>boot-nonfree.iso
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="itemizedlist">
                      <ul class="itemizedlist">
@@ -560,111 +725,178 @@
             </div>
               
          </div>
+<<<<<<< HEAD
+=======
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Downloading and Checking Media">
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e122"></a>Downloading and Checking Media
+=======
                      <h3 class="title"><a name="d5e142"></a>Downloading and Checking Media
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
             </div>
                 
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Downloading">
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e124"></a>Downloading
+=======
                         <h4 class="title"><a name="d5e144"></a>Downloading
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>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
                </p>
+<<<<<<< HEAD
+                     
+=======
                
                      
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
                   them. Keep one of them <a class="link" href="Select-and-use-ISOs.html#integrity">for further
                      usage</a>. Then this window appears:
                </p>
+<<<<<<< HEAD
+                     
+=======
                
                      
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>Check the radio button Save File.</p>
                    
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Checking the downloaded media integrity">
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e136"></a>Checking the downloaded media integrity
+=======
                         <h4 class="title"><a name="d5e156"></a>Checking the downloaded media integrity
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>Both checksums are hexadecimal numbers calculated by an algorithm from the
                   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 have a
+<<<<<<< HEAD
+                  failure. A failure infers that you should retry the download or attempt a
+                  repair using BitTorrent.
+               </p>
+                     
+               <p>Open a console, no need to be root, and:</p>
+=======
                   failure. A failure infers that you should retry the download.
                </p>
                
                      
                <p>Open a console, no need to be root, and:</p>
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>- To use md5sum, type: [sam@localhost]$ <strong class="userinput"><code>md5sum
                         path/to/the/image/file.iso</code></strong>.
                </p>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>- To use sha1sum, type: [sam@localhost]$ <strong class="userinput"><code>sha1sum
                         path/to/the/image/file.iso</code></strong>.
                </p>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>and compare the obtained number on your computer (you may have to wait for a
                   while) with the number given by Mageia. Example:
                </p>
+<<<<<<< HEAD
+                     
+=======
                
                      
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p></p>
                    
             </div>
               
          </div>
+<<<<<<< HEAD
+=======
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Burn or dump the ISO">
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e149"></a>Burn or dump the ISO
+=======
                      <h3 class="title"><a name="d5e169"></a>Burn or dump the ISO
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
             </div>
                 
+<<<<<<< HEAD
+                
+            <p>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 bootable
+               medium.
+            </p>
+=======
             
                 
             <p>The checked ISO can now be burned to a CD or DVD or dumped to a USB
@@ -672,18 +904,26 @@
                medium.
             </p>
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Burning the ISO to a CD/DVD">
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e152"></a>Burning the ISO to a CD/DVD
+=======
                         <h4 class="title"><a name="d5e172"></a>Burning the ISO to a CD/DVD
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>Use whatever burner you wish but ensure the burning device is set correctly
                   to <span class="bold"><strong>burn an image</strong></span>, burn data or files is not
@@ -692,24 +932,37 @@
                </p>
                    
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="section" title="Dump the ISO to a USB stick">
                <div class="titlepage">
                   <div>
                      <div>
+<<<<<<< HEAD
+                        <h4 class="title"><a name="d5e157"></a>Dump the ISO to a USB stick
+=======
                         <h4 class="title"><a name="d5e177"></a>Dump the ISO to a USB stick
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         </h4>
                      </div>
                   </div>
                </div>
                      
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>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.
                </p>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
                   <table border="0" summary="Warning">
@@ -720,7 +973,11 @@
                      <tr>
                         <td align="left" valign="top">
                                    
+<<<<<<< HEAD
+                           <p>"Dumping" an image onto a flash device destroys any previous file-system on
+=======
                            <p>"dumping" an image onto a flash device destroys any previous file-system on
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                               the device; any other data will be lost and the partition capacity will be
                               reduced to the image size.
                            </p>
@@ -729,67 +986,105 @@
                      </tr>
                   </table>
                </div>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <p>To recover the original capacity, you must redo partitioning and re-format
                   the USB stick.
                </p>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="Using a graphical tool within Mageia">
                   <div class="titlepage">
                      <div>
                         <div>
+<<<<<<< HEAD
+                           <h5 class="title"><a name="d5e163"></a>Using a graphical tool within Mageia
+=======
                            <h5 class="title"><a name="d5e183"></a>Using a graphical tool within Mageia
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <p>You can use a graphical tool like <a class="ulink" href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks" target="_top">IsoDumper</a></p>
                         
                </div>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="Using a graphical tool within Windows">
                   <div class="titlepage">
                      <div>
                         <div>
+<<<<<<< HEAD
+                           <h5 class="title"><a name="d5e167"></a>Using a graphical tool within Windows
+=======
                            <h5 class="title"><a name="d5e187"></a>Using a graphical tool within Windows
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+                          
+                  <p>You could try:</p>
+=======
                   
                           
                   <p>You could try:</p>
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> using the
                      "ISO image" option;
                   </p>
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32
                         Disk Imager</a></p>
                         
                </div>
+<<<<<<< HEAD
+=======
                
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      
                <div class="section" title="Using Command line within a GNU/Linux system">
                   <div class="titlepage">
                      <div>
                         <div>
+<<<<<<< HEAD
+                           <h5 class="title"><a name="d5e174"></a>Using Command line within a GNU/Linux system
+=======
                            <h5 class="title"><a name="d5e194"></a>Using Command line within a GNU/Linux system
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            </h5>
                         </div>
                      </div>
                   </div>
                           
+<<<<<<< HEAD
+=======
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
                      <table border="0" summary="Warning">
@@ -808,10 +1103,15 @@
                         </tr>
                      </table>
                   </div>
+<<<<<<< HEAD
+                          
+                  <p>You can also use the dd tool in a console:</p>
+=======
                   
                           
                   <p>You can also use the dd tool in a console:</p>
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                           
                   <div class="orderedlist">
                      <ol class="orderedlist" type="1">
@@ -825,13 +1125,20 @@
                            <p>Become root with the command <strong class="userinput"><code>su -</code></strong> (don't forget the
                               final '-' )
                            </p>
+<<<<<<< HEAD
+=======
                            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                        
                                      
                         </li>
                         <li class="listitem">
                                        
+<<<<<<< HEAD
+                           <p>Plug in your USB stick (do not mount it, this also means do not open any
+=======
                            <p>Plug your USB stick (do not mount it, this also means do not open any
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                               application or file manager that could access or read it)
                            </p>
                                      
@@ -839,15 +1146,22 @@
                         <li class="listitem">
                                        
                            <p>Enter the command <strong class="userinput"><code>fdisk -l</code></strong></p>
+<<<<<<< HEAD
+                                       
+=======
                            
                                        
                            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                        
                            <p>Alternatively, you can get the device name with the command
                               <code class="code">dmesg</code>: at end, you see the device name starting with
                               <span class="emphasis"><em>sd</em></span>, and <span class="emphasis"><em>sdd</em></span> in this case:
                            </p>
+<<<<<<< HEAD
+=======
                            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                        <pre class="screen">[72594.604531] usb 1-1: new high-speed USB device number 27 using xhci_hcd
 [72594.770528] usb 1-1: New USB device found, idVendor=8564, idProduct=1000
 [72594.770533] usb 1-1: New USB device strings: Mfr=1, Product=2, SerialNumber=3
@@ -878,10 +1192,15 @@
                                        
                            <p>Enter the command: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX
                                     bs=1M</code></strong></p>
+<<<<<<< HEAD
+                                       
+                           <p>Where X=your device name eg: /dev/sdc</p>
+=======
                            
                                        
                            <p>Where X=your device name eg: /dev/sdc</p>
                            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                                        
                            <p>Example: # <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
                                     of=/dev/sdb bs=1M</code></strong></p>
diff --git a/hu/acceptLicense.html b/hu/acceptLicense.html
index 1e572ef..e8cb012 100644
--- a/hu/acceptLicense.html
+++ b/hu/acceptLicense.html
@@ -2,7 +2,11 @@
    <head>
       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    
+<<<<<<< HEAD
+      <title>Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek</title>
+=======
       <title>Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek</title>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
@@ -13,11 +17,19 @@
       table { font-family: sans-serif; font-size: 13px }
     --></style></head>
    <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+<<<<<<< HEAD
+      <div lang="hu" class="section" title="Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek">
+         <div class="titlepage">
+            <div>
+               <div>
+                  <h2 class="title"><a name="acceptLicense"></a>Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek
+=======
       <div lang="hu" class="section" title="Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek">
          <div class="titlepage">
             <div>
                <div>
                   <h2 class="title"><a name="acceptLicense"></a>Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </h2>
                </div>
             </div>
diff --git a/hu/addUser.html b/hu/addUser.html
index 482e2d3..a889dc2 100644
--- a/hu/addUser.html
+++ b/hu/addUser.html
@@ -23,6 +23,10 @@
             </div>
          </div>
            
+<<<<<<< HEAD
+           
+           
+=======
          
            
          
@@ -42,6 +46,7 @@
          
            
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="A rendszergazdai (root) jelsz&oacute; be&aacute;ll&iacute;t&aacute;sa">
             <div class="titlepage">
@@ -53,7 +58,10 @@
                </div>
             </div>
                 
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <p>It is advisable for all <span class="application">Mageia</span> installations to
                set a superuser or administrator's password, usually called the
@@ -64,7 +72,10 @@
                just below the first password box, this checks that you have not mistyped
                the first password by comparing them.
             </p>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Note">
@@ -85,7 +96,10 @@
             </div>
               
          </div>
+<<<<<<< HEAD
+=======
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Adjon meg egy felhaszn&aacute;l&oacute;t">
             <div class="titlepage">
@@ -97,6 +111,13 @@
                </div>
             </div>
                 
+<<<<<<< HEAD
+                
+            <p>Add a user here. A user has fewer rights than the superuser (root), but
+               enough to use the internet, office applications or play games and anything
+               else the average user does with his computer
+            </p>
+=======
             
                 
             <p>Add a user here. A user has fewer rights than the superuser (root), but
@@ -104,6 +125,7 @@
                anything else the average user does with his computer
             </p>
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
@@ -123,8 +145,13 @@
                   <li class="listitem">
                              
                      <p><span class="guilabel">Login Name</span>: Here you enter the user login name or let
+<<<<<<< HEAD
+                        drakx use a version of the user's real name. <span class="emphasis"><em>The login name is
+                              case sensitive.</em></span></p>
+=======
                         drakx use a version of the users real name. <span class="emphasis"><em>The login name is case
                               sensitive.</em></span></p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            
                   </li>
                   <li class="listitem">
@@ -145,7 +172,10 @@
                   </li>
                </ul>
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Note">
@@ -156,6 +186,16 @@
                   <tr>
                      <td align="left" valign="top">
                               
+<<<<<<< HEAD
+                        <p>Any user you add while installing Mageia, will have a both read and write
+                           protected home directory (umask=0027).
+                        </p>
+                              
+                        <p>You can add all extra needed users in the <span class="emphasis"><em>Configuration -
+                                 Summary</em></span> step during the install. Choose <span class="emphasis"><em>User
+                                 management</em></span>.
+                        </p>
+=======
                         <p>Any user you add while installing Mageia, will have a world readable (but
                            write protected) home directory.
                         </p>
@@ -177,6 +217,7 @@
                            during the install. Choose <span class="emphasis"><em>User management</em></span>.
                         </p>
                         
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                               
                         <p>The access permissions can also be changed after the install.</p>
                             
@@ -186,7 +227,10 @@
             </div>
               
          </div>
+<<<<<<< HEAD
+=======
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <div class="section" title="Speci&aacute;lis Felhaszn&aacute;l&oacute;kezel&eacute;s">
             <div class="titlepage">
@@ -198,15 +242,23 @@
                </div>
             </div>
                 
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <p>If the <span class="guibutton">advanced</span> button is clicked you are offered a
                screen that allows you to edit the settings for the user you are adding.
             </p>
+<<<<<<< HEAD
+                
+            <p>Additionally, you can disable or enable a guest account.</p>
+=======
             
                 
             <p>Additionally, you can disable or enable a guest account.</p>
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Warning">
@@ -226,7 +278,10 @@
                   </tr>
                </table>
             </div>
+<<<<<<< HEAD
+=======
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                 
             <div class="itemizedlist">
                <ul class="itemizedlist">
diff --git a/hu/chooseDesktop.html b/hu/chooseDesktop.html
index 10b1d70..289b098 100644
--- a/hu/chooseDesktop.html
+++ b/hu/chooseDesktop.html
@@ -22,6 +22,14 @@
                </div>
             </div>
          </div>
+<<<<<<< HEAD
+           
+         
+         
+           
+         
+           
+=======
          
          
              
@@ -31,21 +39,32 @@
          
          
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>Depending on your selection here, you may be offered further screens to fine
             tune your choice.
          </p>
          
+<<<<<<< HEAD
+           
+=======
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>After the selection step(s), you will see a slide show during package
             installation. The slide show can be disabled by pressing the
             <span class="guilabel">Details</span> button
          </p>
          
+<<<<<<< HEAD
+           
+         
+           
+=======
          
          
          
          
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>Choose whether you prefer to use the <span class="application">KDE</span> or
             <span class="application">Gnome</span> desktop environment. Both come with a full
             set of useful applications and tools. Tick <span class="guilabel">Custom</span> if
@@ -54,7 +73,11 @@
             <span class="application">LXDE</span> desktop is lighter than the previous two,
             sporting less eye candy and fewer packages installed by default.
          </p>
+<<<<<<< HEAD
+         
+=======
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       </div>
    </body>
 </html>
diff --git a/hu/choosePackageGroups.html b/hu/choosePackageGroups.html
index 0dbf708..a046ba9 100644
--- a/hu/choosePackageGroups.html
+++ b/hu/choosePackageGroups.html
@@ -22,6 +22,15 @@
                </div>
             </div>
          </div>
+<<<<<<< HEAD
+           
+         
+           
+         
+           
+         
+           
+=======
          
              
          
@@ -30,12 +39,48 @@
          
          
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p>Packages have been sorted into groups, to make choosing what you need on
             your system a lot easier. The groups are fairly self explanatory, however
             more information about the content of each is available in tool-tips which
             become visible as the mouse is hovered over them.
          </p>
          
+<<<<<<< HEAD
+           
+         <div class="itemizedlist">
+            <ul class="itemizedlist">
+               <li class="listitem">
+                        
+                  <p>Munka&aacute;llom&aacute;s.</p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Kiszolg&aacute;l&oacute;.</p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Grafikus k&ouml;rnyezet</p>
+                      
+               </li>
+               <li class="listitem">
+                        
+                  <p>Individual Package Selection: You can use this option to manually add or
+                     remove packages.
+                  </p>
+                      
+               </li>
+            </ul>
+         </div>
+         
+           
+         <p>Read <a class="xref" href="minimal-install.html" title="Minimal Install">&#8222;Minimal Install&#8221;</a> for instructions on how to do a
+            minimal install (without or with X &amp; IceWM).
+         </p>
+         
+=======
              
          <div class="itemizedlist">
             <ul class="itemizedlist">
@@ -68,6 +113,7 @@
             minimal install (without or with X &amp; IceWM).
          </p> 
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       </div>
    </body>
 </html>
diff --git a/hu/diskdrake.html b/hu/diskdrake.html
index a55236e..159d44c 100644
--- a/hu/diskdrake.html
+++ b/hu/diskdrake.html
@@ -29,6 +29,8 @@
            
          
            
+<<<<<<< HEAD
+=======
          
            
          
@@ -41,6 +43,7 @@
            
          
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
             <table border="0" summary="Warning">
                <tr>
@@ -101,7 +104,11 @@
                   <td align="left" valign="top">
                          
                      <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI
+<<<<<<< HEAD
+                        System Partition) is present and correctly mounted on /boot/EFI (see below)
+=======
                         System Partition) is present and correctly mounted on /boot/EFI (see above)
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </p>
                      
                          
@@ -112,6 +119,30 @@
             </table>
          </div>
          
+<<<<<<< HEAD
+           
+         <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <table border="0" summary="Note">
+               <tr>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyz&eacute;s]" src="note.png"></td>
+                  <th align="left"></th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
+                        partition is present with a correct type
+                     </p>
+                     
+                         
+                       
+                  </td>
+               </tr>
+            </table>
+         </div>
+         
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       </div>
    </body>
 </html>
diff --git a/hu/doPartitionDisks.html b/hu/doPartitionDisks.html
index ec01bb9..811400f 100644
--- a/hu/doPartitionDisks.html
+++ b/hu/doPartitionDisks.html
@@ -221,6 +221,35 @@
          </div>
          
            
+<<<<<<< HEAD
+         <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <table border="0" summary="Note">
+               <tr>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyz&eacute;s]" src="note.png"></td>
+                  <th align="left"></th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p>If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk,
+                        you need to create a Bios boot partition if not already existing. It is an
+                        about 1 MiB partition with no mount point. Choose the "Custom disk
+                        partitioning" option to be able to create it with the Installer like any
+                        other partition, just select BIOS boot partition as filesystem type.
+                     </p>
+                     
+                         
+                     
+                         
+                       
+                  </td>
+               </tr>
+            </table>
+         </div>
+         
+           
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
             <table border="0" summary="Warning">
                <tr>
diff --git a/hu/exitInstall.html b/hu/exitInstall.html
index 3b486fb..390af31 100644
--- a/hu/exitInstall.html
+++ b/hu/exitInstall.html
@@ -22,6 +22,13 @@
                </div>
             </div>
          </div>
+<<<<<<< HEAD
+           
+         
+           
+         
+           
+=======
          
          
          
@@ -32,6 +39,7 @@
            
            
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          
            
          <p><a name="exitInstall-pa1"></a>You have finished installing and configuring
@@ -46,6 +54,19 @@
          
            
          <p><a name="exitInstall-pa3"></a>If you didn't adjust the settings for the bootloader, your Mageia install
+<<<<<<< HEAD
+            will be automatically selected and started.
+         </p>
+         
+           
+         <p><a name="exitInstall-pa4"></a>Enjoy!
+         </p>
+         
+           
+         <p><a name="exitInstall-pa5"></a>Visit www.mageia.org if you have any questions or want to contribute to
+            Mageia
+         </p>
+=======
             will be automatically selected and started. 
          </p>
            
@@ -59,6 +80,7 @@
          </p>
            
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          
       </div>
    </body>
diff --git a/hu/index.html b/hu/index.html
index 818dd1d..e1ca433 100644
--- a/hu/index.html
+++ b/hu/index.html
@@ -28,8 +28,13 @@
                   <dl>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Bevezet&eacute;s</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</a></span></dt>
+<<<<<<< HEAD
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Downloading and Checking Media</a></span></dt>
+                     <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Burn or dump the ISO</a></span></dt>
+=======
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Downloading and Checking Media</a></span></dt>
                      <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Burn or dump the ISO</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
                <dt><span class="section"><a href="installer.html">DrakX, the Mageia Installer</a></span></dt>
@@ -40,7 +45,11 @@
                   </dl>
                </dd>
                <dt><span class="section"><a href="selectLanguage.html">V&aacute;lasszon nyelvet</a></span></dt>
+<<<<<<< HEAD
+               <dt><span class="section"><a href="acceptLicense.html">Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek</a></span></dt>
+=======
                <dt><span class="section"><a href="acceptLicense.html">Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                <dd>
                   <dl>
                      <dt><span class="section"><a href="acceptLicense.html#license">Licencegyezm&eacute;ny</a></span></dt>
@@ -75,6 +84,16 @@
                <dt><span class="section"><a href="setupBootloader.html">Rendszerind&iacute;t&aacute;si be&aacute;ll&iacute;t&aacute;sok</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">Using a Mageia bootloader</a></span></dt>
+                     <dt><span class="section"><a href="setupBootloader.html#d5e924">Using an existing bootloader</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">Be&aacute;ll&iacute;t&aacute;sok</a></span></dt>
+                  </dl>
+               </dd>
+               <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt>
+=======
                      <dt><span class="section"><a href="setupBootloader.html#d5e899">With a Bios system</a></span></dt>
                      <dt><span class="section"><a href="setupBootloader.html#d5e936">With an UEFI system</a></span></dt>
                   </dl>
@@ -86,6 +105,7 @@
                      <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e968">With an UEFI system</a></span></dt>
                   </dl>
                </dd>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                <dt><span class="section"><a href="misc-params.html">Summary of miscellaneous parameters</a></span></dt>
                <dd>
                   <dl>
@@ -116,7 +136,11 @@
                <dt><span class="section"><a href="uninstall-Mageia.html">Uninstalling 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#d5e1206">Howto</a></span></dt>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </dl>
                </dd>
             </dl>
diff --git a/hu/misc-params.html b/hu/misc-params.html
index 2f1ca36..1aa2164 100644
--- a/hu/misc-params.html
+++ b/hu/misc-params.html
@@ -29,6 +29,8 @@
            
          
            
+<<<<<<< HEAD
+=======
          
            
          
@@ -51,6 +53,7 @@
            
          
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p><a name="misc-params-pa1"></a>DrakX made smart choices for the configuration of your system depending on
             the choices you made and on the hardware DrakX detected. You can check the
             settings here and change them if you want after pressing
@@ -58,6 +61,47 @@
          </p>
          
            
+<<<<<<< HEAD
+         <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <table border="0" summary="Note">
+               <tr>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyz&eacute;s]" src="note.png"></td>
+                  <th align="left"></th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p>As a general rule, default settings are recommended and you can keep them
+                        with 3 exceptions:
+                     </p>
+                     <div class="itemizedlist">
+                        <ul class="itemizedlist">
+                           <li class="listitem">
+                                        
+                              <p>there are known issues with a default setting</p>
+                                      
+                           </li>
+                           <li class="listitem">
+                                        
+                              <p>the default setting has already been tried and it fails</p>
+                                      
+                           </li>
+                           <li class="listitem">
+                                        
+                              <p>something else is said in the detailed sections below</p>
+                                      
+                           </li>
+                        </ul>
+                     </div>
+                       
+                  </td>
+               </tr>
+            </table>
+         </div>
+         
+           
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <div class="section" title="System parameters">
             <div class="titlepage">
                <div>
@@ -99,7 +143,11 @@
                      </p>
                      
                              
+<<<<<<< HEAD
+                     <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2
+=======
                      <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub and/or Lilo
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </p>
                      
                              
@@ -164,6 +212,28 @@
                      <p><a name="misc-params-hardware-pa1a"></a>This is where you setup or change your keyboard layout which will depend on
                         your location, language or type of keyboard.
                      </p>
+<<<<<<< HEAD
+                     
+                             
+                     <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
+                        <table border="0" summary="Note">
+                           <tr>
+                              <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyz&eacute;s]" src="note.png"></td>
+                              <th align="left"></th>
+                           </tr>
+                           <tr>
+                              <td align="left" valign="top">
+                                           
+                                 <p>If you notice a wrong keyboard layout and want to change it, keep in mind
+                                    that your passwords are going to change too.
+                                 </p>
+                                         
+                              </td>
+                           </tr>
+                        </table>
+                     </div>
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                            
                   </li>
                   <li class="listitem">
@@ -182,7 +252,11 @@
                      <p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Sound card</span>:
                      </p>
                      
+<<<<<<< HEAD
+                             
+=======
                      	
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      <p><a name="misc-params-hardware-pa3a"></a>The installer uses the default driver, if there is a default one. The option
                         to select a different driver is only given when there is more than one
                         driver for your card, but none of them is the default one.
@@ -321,7 +395,12 @@
                      
                              
                      <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your
+<<<<<<< HEAD
+                        selections will depend on what you use your computer for. For more
+                        information, see <a class="xref" href="">???</a>.
+=======
                         selections will depend on what you use your computer for.
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </p>
                      
                              
diff --git a/hu/selectCountry.html b/hu/selectCountry.html
index 5503a21..0ad230f 100644
--- a/hu/selectCountry.html
+++ b/hu/selectCountry.html
@@ -22,6 +22,16 @@
                </div>
             </div>
          </div>
+<<<<<<< HEAD
+           
+         
+           
+         
+           
+         
+           
+         <p><a name="selectCountry-pa1"></a>Select your country or region.  This is important for all kinds of settings,
+=======
          
          
          
@@ -35,16 +45,25 @@
          
              
          <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             like the currency and wireless regulatory domain. Setting the wrong country
             can lead to not being able to use a Wireless network.
          </p>
          
+<<<<<<< HEAD
+           
+=======
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <p><a name="selectCountry-pa2"></a>If your country isn't in the list, click the <span class="guilabel">Other
                Countries</span> button and choose your country / region there.
          </p>
          
+<<<<<<< HEAD
+           
+=======
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
             <table border="0" summary="Note">
                <tr>
@@ -53,19 +72,31 @@
                </tr>
                <tr>
                   <td align="left" valign="top">
+<<<<<<< HEAD
+                         
+=======
                            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      <p><a name="selectCountry-pa3"></a>If your country is only in the <span class="guilabel">Other Countries</span> list,
                         after clicking <span class="guibutton">OK</span> it may seem a country from the
                         first list was chosen. Please ignore this, DrakX will follow your real
                         choice.
                      </p>
+<<<<<<< HEAD
+                       
+=======
                          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                   </td>
                </tr>
             </table>
          </div>
          
+<<<<<<< HEAD
+           
+=======
              
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <div class="section" title="Input method">
             <div class="titlepage">
                <div>
@@ -75,6 +106,21 @@
                   </div>
                </div>
             </div>
+<<<<<<< HEAD
+                
+            
+                
+            <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an
+               input method (at the bottom of the list). Input methods allow users to input
+               multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
+               default input method, so users should not need to configure it
+               manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
+               functions and can be installed if you added HTTP/FTP media before package
+               selection.
+            </p>
+            
+                
+=======
             
                   
             
@@ -90,6 +136,7 @@
             </p>
             
                   
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
                <table border="0" summary="Note">
                   <tr>
@@ -98,19 +145,33 @@
                   </tr>
                   <tr>
                      <td align="left" valign="top">
+<<<<<<< HEAD
+                              
+=======
                                 
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                         <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it
                            after you boot your installed system via "Configure your Computer" -&gt;
                            "System", or by running localedrake as root.
                         </p>
+<<<<<<< HEAD
+                            
+=======
                               
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </td>
                   </tr>
                </table>
             </div>
+<<<<<<< HEAD
+              
+         </div>
+         
+=======
                 
          </div>
            
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       </div>
    </body>
 </html>
diff --git a/hu/selectLanguage.html b/hu/selectLanguage.html
index 44d716b..b0b4332 100644
--- a/hu/selectLanguage.html
+++ b/hu/selectLanguage.html
@@ -7,7 +7,11 @@
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
       <link rel="prev" href="installer.html" title="DrakX, the Mageia Installer">
+<<<<<<< HEAD
+      <link rel="next" href="acceptLicense.html" title="Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+=======
       <link rel="next" href="acceptLicense.html" title="Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          <!--
       body { font-family: sans-serif; font-size: 13px }
       table { font-family: sans-serif; font-size: 13px }
diff --git a/hu/setupBootloader.html b/hu/setupBootloader.html
index 73e4047..c27bf13 100644
--- a/hu/setupBootloader.html
+++ b/hu/setupBootloader.html
@@ -29,6 +29,13 @@
            
          
            
+<<<<<<< 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">
@@ -36,6 +43,7 @@
                <div>
                   <div>
                      <h3 class="title"><a name="d5e899"></a>With a Bios system
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
@@ -43,6 +51,25 @@
                 
             
                 
+<<<<<<< HEAD
+            <p>By default, Mageia uses exclusively:</p>
+            
+                
+            <div class="itemizedlist">
+               <ul class="itemizedlist">
+                  <li class="listitem">
+                             
+                     <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p>
+                           
+                  </li>
+                  <li class="listitem">
+                             
+                     <p>Grub2-efi for a UEFI system.</p>
+                           
+                  </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>
@@ -52,6 +79,7 @@
                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;">
@@ -71,11 +99,19 @@
             </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>
@@ -83,6 +119,11 @@
                      
                
                      
+<<<<<<< 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
@@ -118,15 +159,24 @@
                      </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>
@@ -134,6 +184,93 @@
                      
                
                      
+<<<<<<< HEAD
+               <p>With an UEFI system, the user interface is slightly different as you cannot
+                  choose between with or without graphical menu
+               </p>
+               
+                     
+               
+                     
+               <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>
+                   
+            </div>
+              
+         </div>
+         
+           
+         <div class="section" title="Using a Mageia bootloader">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="d5e910"></a>Using a Mageia bootloader
+                     </h3>
+                  </div>
+               </div>
+            </div>
+                
+            
+                
+            <p>By default, according to your system, Mageia writes a new:</p>
+            
+                
+            <div class="itemizedlist">
+               <ul class="itemizedlist">
+                  <li class="listitem">
+                             
+                     <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
+                        drive or in the BIOS boot partition.
+                     </p>
+                           
+                  </li>
+                  <li class="listitem">
+                             
+                     <p>Grub2-efi bootloader into the ESP</p>
+                           
+                  </li>
+               </ul>
+            </div>
+            
+                
+            <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>
+            
+                
+              
+         </div>
+         
+           
+         <div class="section" title="Using an existing bootloader">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="d5e924"></a>Using an existing bootloader
+                     </h3>
+                  </div>
+               </div>
+            </div>
+                
+            
+                
+            <p>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>
+=======
                <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
@@ -200,15 +337,24 @@
                </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>
@@ -216,13 +362,196 @@
                 
             
                 
+<<<<<<< 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>
             
                 
+              
+         </div>
+         
+           
+         <div class="section" title="Be&aacute;ll&iacute;t&aacute;sok">
+            <div class="titlepage">
+               <div>
+                  <div>
+                     <h3 class="title"><a name="d5e941"></a>Be&aacute;ll&iacute;t&aacute;sok
+                     </h3>
+                  </div>
+               </div>
+            </div>
+                
+            
+                
+            <div class="section" title="First page">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h4 class="title"><a name="d5e943"></a>First page
+                        </h4>
+                     </div>
+                  </div>
+               </div>
+                     
+               
+                     
+               <div class="itemizedlist">
+                  <ul class="itemizedlist">
+                     <li class="listitem">
+                                    
+                        <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.
+                        </p>
+                                  
+                     </li>
+                     <li class="listitem">
+                                    
+                        <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.
+                        </p>
+                                  
+                     </li>
+                     <li class="listitem">
+                                    
+                        <p><span class="guilabel">Password</span>: This text box is where you actually put the
+                           password
+                        </p>
+                                  
+                     </li>
+                     <li class="listitem">
+                                    
+                        <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will
+                           check that it matches with the one set above.
+                        </p>
+                                  
+                     </li>
+                     <li class="listitem">
+                                    
+                        <p><span class="guilabel">Advanced</span></p>
+                        
+                                    
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist">
+                              <li class="listitem">
+                                                 
+                                 <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).
+                                 </p>
+                                               
+                              </li>
+                              <li class="listitem">
+                                                 
+                                 <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
+                                    multiprocessing for multi core processors.
+                                 </p>
+                                               
+                              </li>
+                              <li class="listitem">
+                                                 
+                                 <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.
+                                 </p>
+                                               
+                              </li>
+                              <li class="listitem">
+                                                 
+                                 <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.
+                                 </p>
+                                               
+                              </li>
+                           </ul>
+                        </div>
+                                  
+                     </li>
+                  </ul>
+               </div>
+                   
+            </div>
             
                 
+            <div class="section" title="Next page">
+               <div class="titlepage">
+                  <div>
+                     <div>
+                        <h4 class="title"><a name="d5e975"></a>Next page
+                        </h4>
+                     </div>
+                  </div>
+               </div>
+                     
+               
+                     
+               <div class="itemizedlist">
+                  <ul class="itemizedlist">
+                     <li class="listitem">
+                                  
+                        <p><span class="guilabel">Default:</span> Operating system started up by default
+                        </p>
+                                
+                     </li>
+                     <li class="listitem">
+                                  
+                        <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.
+                        </p>
+                                
+                     </li>
+                     <li class="listitem">
+                                  
+                        <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p>
+                                
+                     </li>
+                     <li class="listitem">
+                                  
+                        <p><span class="guilabel">Advanced</span></p>
+                        <div class="itemizedlist">
+                           <ul class="itemizedlist">
+                              <li class="listitem">
+                                                 
+                                 <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.
+                                 </p>
+                                               
+                              </li>
+                              <li class="listitem">
+                                                 
+                                 <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>
+                                               
+                              </li>
+                           </ul>
+                        </div>
+                                
+                     </li>
+                  </ul>
+               </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
@@ -234,6 +563,7 @@
             
                 
             <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
               
          </div>
          
diff --git a/hu/setupBootloaderAddEntry.html b/hu/setupBootloaderAddEntry.html
index e5a5f49..3b0efab 100644
--- a/hu/setupBootloaderAddEntry.html
+++ b/hu/setupBootloaderAddEntry.html
@@ -27,6 +27,27 @@
            
          
            
+<<<<<<< HEAD
+         <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the
+            software grub-customizer instead (Available in the Mageia repositories).
+         </p>
+         
+           
+         <div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
+            <table border="0" summary="Note">
+               <tr>
+                  <td rowspan="2" align="center" valign="top" width="25"><img alt="[Megjegyz&eacute;s]" src="note.png"></td>
+                  <th align="left"></th>
+               </tr>
+               <tr>
+                  <td align="left" valign="top">
+                         
+                     <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
+                       
+                  </td>
+               </tr>
+            </table>
+=======
          
            
          <div class="section" title="With a Bios system">
@@ -131,6 +152,7 @@
             
                 
               
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </div>
          
       </div>
diff --git a/hu/setupSCSI.html b/hu/setupSCSI.html
index 3a6b677..1f8cd1c 100644
--- a/hu/setupSCSI.html
+++ b/hu/setupSCSI.html
@@ -6,7 +6,11 @@
       <meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
       <link rel="home" href="index.html" title="Installation with DrakX">
       <link rel="up" href="index.html" title="Installation with DrakX">
+<<<<<<< HEAD
+      <link rel="prev" href="acceptLicense.html" title="Licenc &eacute;s Kiad&aacute;si megjegyz&eacute;sek">
+=======
       <link rel="prev" href="acceptLicense.html" title="Licensz &eacute;s Kiad&aacute;si megjegyz&eacute;sek">
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
       <link rel="next" href="selectInstallClass.html" title="Install or Upgrade"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
          <!--
       body { font-family: sans-serif; font-size: 13px }
diff --git a/hu/soundConfig.html b/hu/soundConfig.html
index 19300e4..c2ae706 100644
--- a/hu/soundConfig.html
+++ b/hu/soundConfig.html
@@ -22,7 +22,10 @@
                </div>
             </div>
          </div>
+<<<<<<< HEAD
+=======
          
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          
            
@@ -33,22 +36,35 @@
          <p>In this screen the name of the driver that the installer chose for your
             sound card is given, which will be the default driver if we have a default
             one.
+<<<<<<< HEAD
+         </p>
+         
+=======
               
          </p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <p>The default driver should work without problems. However, if after install
             you do encounter problems, then run <span class="command"><strong>draksound</strong></span> or start
             this tool via MCC (Mageia Control Center), by choosing the
             <span class="guilabel">Hardware</span> tab and clicking on <span class="guilabel">Sound
                Configuration</span> at the top right of the screen.
+<<<<<<< HEAD
+         </p>
+         
+=======
               
          </p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
            
          <p>Then, in the draksound or "Sound Configuration" tool screen, click on
             <span class="guibutton">Advanced</span> and then on
             <span class="guibutton">Troubleshooting</span> to find very useful advice about how
             to solve the problem.
+<<<<<<< HEAD
+=======
               
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
          </p>
          
            
@@ -67,15 +83,22 @@
             <p>Clicking <span class="guibutton">Advanced</span> in this screen, during install, is
                useful if there is no default driver and there are several drivers
                available, but you think the installer selected the wrong one.
+<<<<<<< HEAD
+=======
                    
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
             </p>
             
                 
             <p>In that case you can select a different driver after clicking on
                <span class="guibutton">Let me pick any driver</span>.
+<<<<<<< HEAD
+            </p>
+=======
                    
             </p>
             
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
               
          </div>
          
diff --git a/hu/uninstall-Mageia.html b/hu/uninstall-Mageia.html
index 5ac40e4..cc6c70a 100644
--- a/hu/uninstall-Mageia.html
+++ b/hu/uninstall-Mageia.html
@@ -31,7 +31,11 @@
             <div class="titlepage">
                <div>
                   <div>
+<<<<<<< HEAD
+                     <h3 class="title"><a name="d5e1247"></a>Howto
+=======
                      <h3 class="title"><a name="d5e1206"></a>Howto
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
                      </h3>
                   </div>
                </div>
-- 
cgit v1.2.1