Update Hungarian files

1 files changed, 79 insertions, 0 deletions

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>