Update Hungarian files

1 files changed, 61 insertions, 0 deletions

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>