diff options
Diffstat (limited to 'hu/selectCountry.html')
| -rw-r--r-- | hu/selectCountry.html | 68 |
1 files changed, 0 insertions, 68 deletions
diff --git a/hu/selectCountry.html b/hu/selectCountry.html index 0ad230f..f8dc0b5 100644 --- a/hu/selectCountry.html +++ b/hu/selectCountry.html @@ -22,7 +22,6 @@ </div> </div> </div> -<<<<<<< HEAD @@ -31,39 +30,16 @@ <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings, -======= - - - - - - - - - - - - - <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és" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -72,31 +48,19 @@ </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> @@ -106,7 +70,6 @@ </div> </div> </div> -<<<<<<< HEAD @@ -120,23 +83,6 @@ </p> -======= - - - - - <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 in Mageia DVDs, Africa/India and Asia/no-India - Live-CDs. For Asian and African locales, IBus will be set as 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> - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="note" title="Megjegyzés" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> <tr> @@ -145,33 +91,19 @@ </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" -> "System", or by running localedrake as root. </p> -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> </table> </div> -<<<<<<< HEAD </div> -======= - - </div> - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> </body> </html> |