aboutsummaryrefslogtreecommitdiffstats
path: root/hu
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /hu
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'hu')
-rw-r--r--hu/Select-and-use-ISOs.html467
-rw-r--r--hu/acceptLicense.html12
-rw-r--r--hu/addUser.html96
-rw-r--r--hu/chooseDesktop.html28
-rw-r--r--hu/choosePackageGroups.html46
-rw-r--r--hu/diskdrake.html22
-rw-r--r--hu/doPartitionDisks.html3
-rw-r--r--hu/exitInstall.html29
-rw-r--r--hu/index.html27
-rw-r--r--hu/misc-params.html43
-rw-r--r--hu/selectCountry.html68
-rw-r--r--hu/selectLanguage.html4
-rw-r--r--hu/setupBootloader.html172
-rw-r--r--hu/setupBootloaderAddEntry.html107
-rw-r--r--hu/setupSCSI.html4
-rw-r--r--hu/soundConfig.html28
-rw-r--r--hu/uninstall-Mageia.html4
17 files changed, 0 insertions, 1160 deletions
diff --git a/hu/Select-and-use-ISOs.html b/hu/Select-and-use-ISOs.html
index 9773f33..85f66a8 100644
--- a/hu/Select-and-use-ISOs.html
+++ b/hu/Select-and-use-ISOs.html
@@ -23,13 +23,7 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Bevezet&eacute;s">
<div class="titlepage">
@@ -41,23 +35,12 @@
</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">
@@ -80,18 +63,10 @@
</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">
@@ -103,10 +78,6 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Definition">
<div class="titlepage">
@@ -118,28 +89,16 @@
</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">
@@ -151,10 +110,6 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Common features">
<div class="titlepage">
@@ -166,10 +121,6 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -187,10 +138,6 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="DVD">
<div class="titlepage">
@@ -202,20 +149,12 @@
</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">
@@ -239,96 +178,30 @@
</div>
</div>
-<<<<<<< HEAD
-
- </div>
-=======
-
-
- <div class="section" title="DVD dual arch">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e56"></a>DVD dual arch
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p>Both architectures are present on the same medium, the choice is made
- automatically according to the detected CPU.
- </p>
-
- </li>
- <li class="listitem">
-
- <p>Uses Xfce desktop only.</p>
-
- </li>
- <li class="listitem">
-
- <p>Not all languages are available. (be, bg, ca, de, en, es, fr, it, mk, pl,
- pt, ru, sv, uk) TO BE CHECKED!
- </p>
-
- </li>
- <li class="listitem">
-
- <p>It contains non free software.</p>
-
- </li>
- </ul>
- </div>
-
- </div>
</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">
@@ -341,11 +214,7 @@
</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">
@@ -369,90 +238,50 @@
</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">
- <div class="titlepage">
- <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">
- <div class="titlepage">
- <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">
@@ -463,44 +292,6 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
-=======
- <p>English language only.</p>
-
- </li>
- <li class="listitem">
-
- <p>32 bit only.</p>
-
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <div class="section" title="Live DVD KDE">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e101"></a>Live DVD KDE
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p>KDE desktop environment only.</p>
-
- </li>
- <li class="listitem">
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>All languages are present.</p>
</li>
@@ -513,41 +304,23 @@
</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">
- <div class="titlepage">
- <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">
@@ -566,48 +339,28 @@
</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">
@@ -643,31 +396,17 @@
</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">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e132"></a>boot.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -682,31 +421,17 @@
</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">
- <div class="titlepage">
- <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">
@@ -725,205 +450,112 @@
</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
- stick. These operations are not a simple copy and aim to make a boot-able
- 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
@@ -932,37 +564,21 @@
</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">
@@ -973,11 +589,7 @@
<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>
@@ -986,105 +598,58 @@
</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">
@@ -1103,15 +668,8 @@
</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">
@@ -1125,20 +683,12 @@
<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>
@@ -1146,22 +696,12 @@
<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
@@ -1192,15 +732,8 @@
<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 e8cb012..542c121 100644
--- a/hu/acceptLicense.html
+++ b/hu/acceptLicense.html
@@ -2,11 +2,7 @@
<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">
@@ -17,19 +13,11 @@
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 a889dc2..c6890cc 100644
--- a/hu/addUser.html
+++ b/hu/addUser.html
@@ -23,30 +23,8 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="A rendszergazdai (root) jelsz&oacute; be&aacute;ll&iacute;t&aacute;sa">
<div class="titlepage">
@@ -58,10 +36,6 @@
</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
@@ -72,10 +46,6 @@
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">
@@ -96,10 +66,6 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Adjon meg egy felhaszn&aacute;l&oacute;t">
<div class="titlepage">
@@ -111,21 +77,11 @@
</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
- enough to surf the internet, use office applications or play games and
- anything else the average user does with his computer
- </p>
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -145,13 +101,8 @@
<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">
@@ -172,10 +123,6 @@
</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">
@@ -186,7 +133,6 @@
<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>
@@ -195,29 +141,6 @@
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>
-
-
- <p>However, while using your new install, any user you add in <span class="emphasis"><em>MCC -
- System - Manage users on system</em></span> will have a home directory that
- is both read and write protected.
- </p>
-
-
- <p>If you don't want a world readable home directory for anyone, it is advised
- to only add a temporary user now and to add the real one(s) after reboot.
- </p>
-
-
- <p>If you prefer world readable home directories, you might want to 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>
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>The access permissions can also be changed after the install.</p>
@@ -227,10 +150,6 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Speci&aacute;lis Felhaszn&aacute;l&oacute;kezel&eacute;s">
<div class="titlepage">
@@ -242,23 +161,12 @@
</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">
@@ -278,10 +186,6 @@
</tr>
</table>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
diff --git a/hu/chooseDesktop.html b/hu/chooseDesktop.html
index 289b098..f5e9430 100644
--- a/hu/chooseDesktop.html
+++ b/hu/chooseDesktop.html
@@ -22,49 +22,25 @@
</div>
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
->>>>>>> 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
@@ -73,11 +49,7 @@
<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 a046ba9..fa7131c 100644
--- a/hu/choosePackageGroups.html
+++ b/hu/choosePackageGroups.html
@@ -22,7 +22,6 @@
</div>
</div>
</div>
-<<<<<<< HEAD
@@ -30,23 +29,12 @@
-=======
-
-
-
-
-
-
-
-
->>>>>>> 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">
@@ -80,40 +68,6 @@
minimal install (without or with X &amp; IceWM).
</p>
-=======
-
- <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>
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</body>
</html>
diff --git a/hu/diskdrake.html b/hu/diskdrake.html
index 159d44c..7094539 100644
--- a/hu/diskdrake.html
+++ b/hu/diskdrake.html
@@ -29,21 +29,6 @@
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -104,11 +89,7 @@
<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>
@@ -119,7 +100,6 @@
</table>
</div>
-<<<<<<< HEAD
<div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -141,8 +121,6 @@
</table>
</div>
-=======
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</body>
</html>
diff --git a/hu/doPartitionDisks.html b/hu/doPartitionDisks.html
index 811400f..10950ca 100644
--- a/hu/doPartitionDisks.html
+++ b/hu/doPartitionDisks.html
@@ -221,7 +221,6 @@
</div>
-<<<<<<< HEAD
<div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -248,8 +247,6 @@
</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 390af31..bca3d7d 100644
--- a/hu/exitInstall.html
+++ b/hu/exitInstall.html
@@ -22,24 +22,11 @@
</div>
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p><a name="exitInstall-pa1"></a>You have finished installing and configuring
@@ -54,7 +41,6 @@
<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>
@@ -66,21 +52,6 @@
<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>
-
-
- <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>
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</body>
diff --git a/hu/index.html b/hu/index.html
index e1ca433..d1b4f0c 100644
--- a/hu/index.html
+++ b/hu/index.html
@@ -28,13 +28,8 @@
<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>
@@ -45,11 +40,7 @@
</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>
@@ -84,7 +75,6 @@
<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>
@@ -93,19 +83,6 @@
</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>
- </dd>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e951">With a Bios system</a></span></dt>
- <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>
@@ -136,11 +113,7 @@
<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 1aa2164..cba9c59 100644
--- a/hu/misc-params.html
+++ b/hu/misc-params.html
@@ -29,31 +29,6 @@
-<<<<<<< HEAD
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> 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
@@ -61,7 +36,6 @@
</p>
-<<<<<<< HEAD
<div class="note" title="Megjegyz&eacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -100,8 +74,6 @@
</div>
-=======
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="System parameters">
<div class="titlepage">
<div>
@@ -143,11 +115,7 @@
</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>
@@ -212,7 +180,6 @@
<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;">
@@ -232,8 +199,6 @@
</tr>
</table>
</div>
-=======
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -252,11 +217,7 @@
<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.
@@ -395,12 +356,8 @@
<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 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&eacute;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&eacute;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" -&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 b0b4332..841a3d1 100644
--- a/hu/selectLanguage.html
+++ b/hu/selectLanguage.html
@@ -7,11 +7,7 @@
<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 c27bf13..f320489 100644
--- a/hu/setupBootloader.html
+++ b/hu/setupBootloader.html
@@ -29,21 +29,11 @@
-<<<<<<< HEAD
<div class="section" title="Bootloader interface">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e886"></a>Bootloader interface
-=======
-
-
- <div class="section" title="With a Bios system">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e899"></a>With a Bios system
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -51,7 +41,6 @@
-<<<<<<< HEAD
<p>By default, Mageia uses exclusively:</p>
@@ -69,17 +58,6 @@
</li>
</ul>
</div>
-=======
- <p><a name="setupBootloader-pa1"></a>If you prefer different bootloader settings to those chosen automatically by
- the installer, you can change them here.
- </p>
-
-
- <p><a name="setupBootloader-pa2"></a>You may already have another operating system on your machine, in which case
- you need to decide whether to add Mageia to your existing bootloader, or
- allow Mageia to create a new one.
- </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -99,19 +77,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
-=======
- <div class="section" title="Using a Mageia bootloader">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="usingMageiaBootloader"></a>Using a Mageia bootloader
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -119,64 +89,18 @@
-<<<<<<< HEAD
<p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
-=======
- <p><a name="setupBootloader-pa4"></a>By default, Mageia writes a new GRUB (legacy) bootloader into the MBR
- (Master Boot Record) of your first hard drive. If you already have other
- operating systems installed, Mageia attempts to add them to your new Mageia
- boot menu.
- </p>
-
-
- <p>Mageia now also offers GRUB2 as an optional bootloader in addition to GRUB
- legacy and Lilo.
- </p>
-
-
- <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Warning">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Figyelem]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><a name="setupBootloader-pa6"></a>Linux systems which use the GRUB2 bootloader are not currently supported by
- GRUB (legacy) and will not be recognized if the default GRUB bootloader is
- used.
- </p>
-
-
- <p>The best solution here is to use the GRUB2 bootloader which is available at
- the Summary page during installation.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
-<<<<<<< HEAD
<div class="section" title="Grub2-efi on UEFI systems">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
-=======
- <div class="section" title="Using an existing bootloader">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="usingExistingBootloader"></a>Using an existing bootloader
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -184,7 +108,6 @@
-<<<<<<< HEAD
<p>With an UEFI system, the user interface is slightly different as you cannot
choose between with or without graphical menu
</p>
@@ -270,91 +193,15 @@
add it automatically. See the documentation for the operating system in
question.
</p>
-=======
- <p><a name="setupBootloader-pa46"></a>If you decide to use an existing bootloader then you will need to remember
- to STOP at the summary page during the installation and click the Bootloader
- <span class="guibutton">Configure</span> button, which will allow you to change the
- bootloader install location.
- </p>
-
-
- <p><a name="setupBootloader-pa47"></a>Do not select a device e.g."sda", or you will overwrite your existing
- MBR. You must select the root partition that you chose during the
- partitioning phase earlier, e.g. sda7.
- </p>
-
-
- <p><a name="setupBootloader-pa48"></a>To be clear, sda is a device, sda7 is a partition on that device.
- </p>
-
-
- <div class="tip" title="Tipp" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Tip">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Tipp]" src="tip.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><a name="setupBootloader-pa48a"></a>Go to tty2 with Ctrl+Alt+F2 and type <code class="literal">df</code> to check where
- your <code class="literal">/</code> (root) partition is. Ctrl+Alt+F7 takes you back to
- the installer screen.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
- <p><a name="setupBootloader-pa49"></a>The exact procedure for adding your Mageia system to an existing bootloader
- is beyond the scope of this help, however in most cases it will involve
- running the relevant bootloader installation program which should detect and
- add it automatically. See the documentation for the operating system in
- question.
- </p>
-
- </div>
-
-
- <div class="section" title="Bootloader advanced option">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="advancedOptionBootloader"></a>Bootloader advanced option
- </h4>
- </div>
- </div>
- </div>
-
-
-
- <p><a name="setupBootloader-pa52"></a>If you have very limited disk space for the <code class="literal">/</code> partition
- that contains <code class="literal">/tmp</code>, click on
- <span class="guibutton">Advanced</span> and check the box for <span class="guilabel">Clean /tmp
- at each boot</span>. This helps to maintain some free space.
- </p>
-
- </div>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
-<<<<<<< HEAD
<div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e927"></a>Using chain loading
-=======
- <div class="section" title="With an UEFI system">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e936"></a>With an UEFI system
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -362,21 +209,15 @@
-<<<<<<< HEAD
<p>If you don't want a bootable Mageia, but to chain load it from another OS,
click on <span class="guibutton">Next</span>, then on
<span class="guibutton">Advanced</span> and Check the box <span class="guilabel">Do not touch ESP
or MBR</span>.
-=======
- <p>With an UEFI system, the user interface is slightly different as you cannot
- choose the boot loader since only Grub2-efi is available.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>You will get a warning that the bootloader is missing, ignore it by clicking
<span class="guibutton">OK</span>.
</p>
@@ -551,19 +392,6 @@
</div>
</div>
-=======
- <p>If Mageia is the first system installed on your computer, the installer
- created an ESP (EFI System Partition) to receive the bootloader
- (Grub2-efi). If there was already UEFI operating systems previously
- installed on your computer (Windows 8 for example), the Mageia installer
- detected the existing ESP created by Windows and added grub2-efi. Although
- it is possible to have several ESPs, only one is advised and enough whatever
- the number of operating systems you have.
- </p>
-
-
- <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
diff --git a/hu/setupBootloaderAddEntry.html b/hu/setupBootloaderAddEntry.html
index 3b0efab..9b5f6a5 100644
--- a/hu/setupBootloaderAddEntry.html
+++ b/hu/setupBootloaderAddEntry.html
@@ -27,7 +27,6 @@
-<<<<<<< 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>
@@ -47,112 +46,6 @@
</td>
</tr>
</table>
-=======
-
-
- <div class="section" title="With a Bios system">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e951"></a>With a Bios system
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>You can add an entry or modify the one you select first, by pressing the
- relevant button in the <span class="emphasis"><em>Bootloader Configuration</em></span> screen
- and editing the screen that pops up on top of it.
- </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>If you have chosen <code class="code">Grub 2</code> as your bootloader, you cannot use
- this tool to edit entries at this step, press 'Next'. You need to manually
- edit <code class="code">/boot/grub2/custom.cfg</code> or use <code class="code">grub-customizer</code>
- instead.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
-
- <p>Some things that can be done without any risk, are changing the label of an
- entry and ticking the box to make an entry the default one.
- </p>
-
-
- <p>You can add the proper version number of an entry, or rename it completely.</p>
-
-
- <p>The default entry is the one the systems boots into if you don't make a
- choice while booting up.
- </p>
-
-
- <div class="warning" title="Figyelem" style="margin-left: 0.5in; margin-right: 0.5in;">
- <table border="0" summary="Warning">
- <tr>
- <td rowspan="2" align="center" valign="top" width="25"><img alt="[Figyelem]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Editing other things can leave you with an unbootable system. Please don't
- just try something without knowing what you are doing.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </div>
-
-
- <div class="section" title="With an UEFI system">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e968"></a>With an UEFI system
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>In this case you are using Grub2-efi and you cannot use this tool to edit
- entries at this step. To do that you need to manually edit
- <code class="code">/boot/grub2/custom.cfg</code> or use <code class="code">grub-customizer</code>
- instead. All you can do here, is to choose the default entry in the drop
- down list.
- </p>
-
-
- <p>After a click on the <span class="guibutton">Next</span> button, another drop down
- list allows to choose the video resolution for Grub2 which is a graphical
- boot loader.
- </p>
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</div>
diff --git a/hu/setupSCSI.html b/hu/setupSCSI.html
index 1f8cd1c..23c8054 100644
--- a/hu/setupSCSI.html
+++ b/hu/setupSCSI.html
@@ -6,11 +6,7 @@
<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 c2ae706..518b063 100644
--- a/hu/soundConfig.html
+++ b/hu/soundConfig.html
@@ -22,10 +22,6 @@
</div>
</div>
</div>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -36,35 +32,21 @@
<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>
@@ -83,22 +65,12 @@
<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 cc6c70a..d486a27 100644
--- a/hu/uninstall-Mageia.html
+++ b/hu/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<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>
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-02 05:49:13 +0000