aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ca/Select-and-use-ISOs.html78
-rw-r--r--ca/addUser.html16
-rw-r--r--ca/ask_mntpoint_s.html2
-rw-r--r--ca/diskdrake.html6
-rw-r--r--ca/doPartitionDisks.html38
-rw-r--r--ca/formatPartitions.html2
-rw-r--r--ca/index.html32
-rw-r--r--ca/selectKeyboard.html2
-rw-r--r--ca/setupBootloader.html116
-rw-r--r--ca/takeOverHdConfirm.html2
-rw-r--r--ca/uninstall-Mageia.html6
-rw-r--r--cs/Select-and-use-ISOs.html80
-rw-r--r--cs/addUser.html12
-rw-r--r--cs/doPartitionDisks.html9
-rw-r--r--cs/index.html17
-rw-r--r--cs/setupBootloader.html87
-rw-r--r--cs/uninstall-Mageia.html4
-rw-r--r--de/Select-and-use-ISOs.html80
-rw-r--r--de/addUser.html16
-rw-r--r--de/choosePackageGroups.html9
-rw-r--r--de/doPartitionDisks.html17
-rw-r--r--de/index.html17
-rw-r--r--de/misc-params.html5
-rw-r--r--de/selectCountry.html14
-rw-r--r--de/setupBootloader.html139
-rw-r--r--de/uninstall-Mageia.html4
-rw-r--r--es/Select-and-use-ISOs.html132
-rw-r--r--es/addUser.html6
-rw-r--r--es/choosePackageGroups.html5
-rw-r--r--es/diskdrake.html10
-rw-r--r--es/doPartitionDisks.html8
-rw-r--r--es/index.html17
-rw-r--r--es/misc-params.html32
-rw-r--r--es/selectCountry.html22
-rw-r--r--es/setupBootloader.html198
-rw-r--r--es/setupBootloaderAddEntry.html9
-rw-r--r--es/uninstall-Mageia.html4
-rw-r--r--et/Select-and-use-ISOs.html20
-rw-r--r--et/addUser.html21
-rw-r--r--et/index.html14
-rw-r--r--et/setupBootloader.html81
-rw-r--r--et/setupBootloaderAddEntry.html105
-rw-r--r--eu/Select-and-use-ISOs.html19
-rw-r--r--eu/addUser.html21
-rw-r--r--eu/index.html20
-rw-r--r--eu/setupBootloader.html106
-rw-r--r--eu/setupBootloaderAddEntry.html105
-rw-r--r--eu/uninstall-Mageia.html4
-rw-r--r--fr/index.html18
-rw-r--r--fr/setupBootloader.html8
-rw-r--r--fr/setupBootloaderAddEntry.html111
-rw-r--r--fr/uninstall-Mageia.html4
-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
-rw-r--r--nl/Select-and-use-ISOs.html115
-rw-r--r--nl/index.html17
-rw-r--r--nl/setupBootloader.html66
-rw-r--r--nl/uninstall-Mageia.html4
-rw-r--r--ro/Select-and-use-ISOs.html260
-rw-r--r--ro/addUser.html54
-rw-r--r--ro/chooseDesktop.html19
-rw-r--r--ro/choosePackageGroups.html36
-rw-r--r--ro/diskdrake.html37
-rw-r--r--ro/doPartitionDisks.html26
-rw-r--r--ro/exitInstall.html19
-rw-r--r--ro/index.html19
-rw-r--r--ro/misc-params.html88
-rw-r--r--ro/selectCountry.html67
-rw-r--r--ro/setupBootloader.html386
-rw-r--r--ro/setupBootloaderAddEntry.html122
-rw-r--r--ro/soundConfig.html9
-rw-r--r--ro/uninstall-Mageia.html2
-rw-r--r--sl/Select-and-use-ISOs.html79
-rw-r--r--sl/acceptLicense.html6
-rw-r--r--sl/addUser.html78
-rw-r--r--sl/add_supplemental_media.html32
-rw-r--r--sl/doPartitionDisks.html6
-rw-r--r--sl/index.html12
-rw-r--r--sl/setupBootloader.html60
-rw-r--r--sl/uninstall-Mageia.html2
-rw-r--r--sq/Select-and-use-ISOs.html255
-rw-r--r--sq/addUser.html53
-rw-r--r--sq/chooseDesktop.html19
-rw-r--r--sq/choosePackageGroups.html36
-rw-r--r--sq/diskdrake.html35
-rw-r--r--sq/doPartitionDisks.html26
-rw-r--r--sq/exitInstall.html17
-rw-r--r--sq/index.html19
-rw-r--r--sq/misc-params.html87
-rw-r--r--sq/selectCountry.html54
-rw-r--r--sq/setupBootloader.html381
-rw-r--r--sq/setupBootloaderAddEntry.html119
-rw-r--r--sq/soundConfig.html9
-rw-r--r--sq/uninstall-Mageia.html2
-rw-r--r--tr/Select-and-use-ISOs.html110
-rw-r--r--tr/index.html17
-rw-r--r--tr/selectCountry.html22
-rw-r--r--tr/setupBootloader.html198
-rw-r--r--tr/setupBootloaderAddEntry.html9
-rw-r--r--tr/uninstall-Mageia.html4
-rw-r--r--uk/Select-and-use-ISOs.html101
-rw-r--r--uk/index.html17
-rw-r--r--uk/setupBootloader.html41
-rw-r--r--uk/uninstall-Mageia.html4
-rwxr-xr-xupdate-help_files.sh2
-rw-r--r--zh_cn/Select-and-use-ISOs.html172
-rw-r--r--zh_cn/addUser.html8
-rw-r--r--zh_cn/doPartitionDisks.html9
-rw-r--r--zh_cn/index.html17
-rw-r--r--zh_cn/setupBootloader.html88
-rw-r--r--zh_cn/uninstall-Mageia.html4
126 files changed, 1206 insertions, 5420 deletions
diff --git a/ca/Select-and-use-ISOs.html b/ca/Select-and-use-ISOs.html
index 88a3008..aaa5273 100644
--- a/ca/Select-and-use-ISOs.html
+++ b/ca/Select-and-use-ISOs.html
@@ -136,24 +136,6 @@
</p>
</li>
- </ul>
- </div>
-
- </div>
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
<li class="listitem">
<p>Suports diferents per a arquitectura de 32 &oacute; 64 bits.</p>
@@ -189,7 +171,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e56"></a>Mitj&agrave; aut&ograve;nom
+ <h4 class="title"><a name="d5e53"></a>Mitj&agrave; aut&ograve;nom
</h4>
</div>
</div>
@@ -200,7 +182,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e58"></a>Caracter&iacute;stiques comunes
+ <h5 class="title"><a name="d5e55"></a>Caracter&iacute;stiques comunes
</h5>
</div>
</div>
@@ -219,7 +201,7 @@
</li>
<li class="listitem">
- <p>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</p>
+ <p>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</p>
</li>
<li class="listitem">
@@ -248,7 +230,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e72"></a>Live DVD Plasma
+ <h5 class="title"><a name="d5e69"></a>Live DVD Plasma
</h5>
</div>
</div>
@@ -269,7 +251,7 @@
</li>
<li class="listitem">
- <p>Suports diferents per a arquitectura de 32 &oacute; 64 bits.</p>
+ <p>64 bit architecture only.</p>
</li>
</ul>
@@ -281,7 +263,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e81"></a>DVD aut&ograve;nom de GNOME
+ <h5 class="title"><a name="d5e78"></a>DVD aut&ograve;nom de GNOME
</h5>
</div>
</div>
@@ -302,7 +284,7 @@
</li>
<li class="listitem">
- <p>Suports diferents per a arquitectura de 32 &oacute; 64 bits.</p>
+ <p>64 bit architecture only</p>
</li>
</ul>
@@ -314,7 +296,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e90"></a>Live DVD Xfce
+ <h5 class="title"><a name="d5e87"></a>Live DVD Xfce
</h5>
</div>
</div>
@@ -335,7 +317,7 @@
</li>
<li class="listitem">
- <p>Suports diferents per a arquitectura de 32 &oacute; 64 bits.</p>
+ <p>32 or 64 bit architectures.</p>
</li>
</ul>
@@ -349,7 +331,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e99"></a>Suport CD nom&eacute;s d'arrencada
+ <h4 class="title"><a name="d5e96"></a>Suport CD nom&eacute;s d'arrencada
</h4>
</div>
</div>
@@ -360,7 +342,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e101"></a>Caracter&iacute;stiques comunes
+ <h5 class="title"><a name="d5e98"></a>Caracter&iacute;stiques comunes
</h5>
</div>
</div>
@@ -406,7 +388,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
+ <h5 class="title"><a name="d5e109"></a>netinstall.iso
</h5>
</div>
</div>
@@ -417,8 +399,8 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Nom&eacute;s cont&eacute; programari lliure, per a qui rebutja la utilitzaci&oacute; de
- programari de propietat.
+ <p>Contains only free software, for those people who prefer not to use non-free
+ software.
</p>
</li>
@@ -431,7 +413,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
+ <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
</h5>
</div>
</div>
@@ -460,7 +442,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e122"></a>Baixada i comprovaci&oacute; del mitj&agrave;
+ <h3 class="title"><a name="d5e119"></a>Baixada i comprovaci&oacute; del mitj&agrave;
</h3>
</div>
</div>
@@ -471,7 +453,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e124"></a>Baixada
+ <h4 class="title"><a name="d5e121"></a>Baixada
</h4>
</div>
</div>
@@ -480,14 +462,14 @@
<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
+ mirror in use and an opportunity to change if the bandwidth is to low. If
http is chosen, you may also see something like
</p>
<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:
+ usage</a>. Then a window similar to this one appears:
</p>
@@ -495,11 +477,11 @@
</div>
- <div class="section" title="Comprovaci&oacute; de la integritat del suport baixat">
+ <div class="section" title="Checking the integrity of the downloaded media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e136"></a>Comprovaci&oacute; de la integritat del suport baixat
+ <h4 class="title"><a name="d5e133"></a>Checking the integrity of the downloaded media
</h4>
</div>
</div>
@@ -539,7 +521,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e149"></a>Enregistrament o bolcat de l'ISO
+ <h3 class="title"><a name="d5e146"></a>Enregistrament o bolcat de l'ISO
</h3>
</div>
</div>
@@ -555,7 +537,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e152"></a>Enregistrament de l'ISO a un CD/DVD
+ <h4 class="title"><a name="d5e149"></a>Enregistrament de l'ISO a un CD/DVD
</h4>
</div>
</div>
@@ -574,7 +556,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e157"></a>Bolcat de l'ISO a un llapis de mem&ograve;ria USB
+ <h4 class="title"><a name="d5e154"></a>Bolcat de l'ISO a un llapis de mem&ograve;ria USB
</h4>
</div>
</div>
@@ -605,15 +587,15 @@
</table>
</div>
- <p>To recover the original capacity, you must redo partitioning and re-format
- the USB stick.
+ <p>Per recuperar la capacitat original, heu de refer les particions i tornar a
+ formatar la mem&ograve;ria USB.
</p>
<div class="section" title="Using a graphical tool within Mageia">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e163"></a>Using a graphical tool within Mageia
+ <h5 class="title"><a name="d5e160"></a>Using a graphical tool within Mageia
</h5>
</div>
</div>
@@ -628,7 +610,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e167"></a>Using a graphical tool within Windows
+ <h5 class="title"><a name="d5e164"></a>Using a graphical tool within Windows
</h5>
</div>
</div>
@@ -650,7 +632,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e174"></a>Using Command line within a GNU/Linux system
+ <h5 class="title"><a name="d5e171"></a>Using Command line within a GNU/Linux system
</h5>
</div>
</div>
@@ -741,7 +723,7 @@
<p>On X=nom del dispositiu, per exemple: /dev/sdc</p>
- <p>Exemple: # <strong class="userinput"><code>dd if=/home/usuari/Baixades/Mageia-4-x86_64-DVD.iso
+ <p>Example: # <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
of=/dev/sdb bs=1M</code></strong></p>
</li>
diff --git a/ca/addUser.html b/ca/addUser.html
index b53ddef..b9f9e95 100644
--- a/ca/addUser.html
+++ b/ca/addUser.html
@@ -23,16 +23,8 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Estableix la contrasenya d'administrador (root):">
<div class="titlepage">
@@ -146,19 +138,11 @@
<p>Any user you add while installing Mageia, will have a both read and write
protected home directory (umask=0027).
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<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>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Els permisos d'acc&eacute;s tamb&eacute; es poden modificar despr&eacute;s de la instal&middot;laci&oacute;.</p>
diff --git a/ca/ask_mntpoint_s.html b/ca/ask_mntpoint_s.html
index 521c935..090ec33 100644
--- a/ca/ask_mntpoint_s.html
+++ b/ca/ask_mntpoint_s.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="up" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
- <link rel="prev" href="doPartitionDisks.html" title="Particionament">
+ <link rel="prev" href="doPartitionDisks.html" title="Particions">
<link rel="next" href="takeOverHdConfirm.html" title="Confirmaci&oacute; del disc dur que es formatar&agrave;"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
diff --git a/ca/diskdrake.html b/ca/diskdrake.html
index 1bcbdce..164d297 100644
--- a/ca/diskdrake.html
+++ b/ca/diskdrake.html
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Particionament personalitzat del disc amb DiskDrake</title>
+ <title>Particions personalitzades del disc amb DiskDrake</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="up" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
@@ -13,11 +13,11 @@
table { font-family: sans-serif; font-size: 13px }
--></style></head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <div lang="ca" class="section" title="Particionament personalitzat del disc amb DiskDrake">
+ <div lang="ca" class="section" title="Particions personalitzades del disc amb DiskDrake">
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="diskdrake"></a>Particionament personalitzat del disc amb DiskDrake
+ <h2 class="title"><a name="diskdrake"></a>Particions personalitzades del disc amb DiskDrake
</h2>
</div>
</div>
diff --git a/ca/doPartitionDisks.html b/ca/doPartitionDisks.html
index 04249d6..efe59cd 100644
--- a/ca/doPartitionDisks.html
+++ b/ca/doPartitionDisks.html
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Particionament</title>
+ <title>Particions</title>
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="up" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
@@ -13,11 +13,11 @@
table { font-family: sans-serif; font-size: 13px }
--></style></head>
<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
- <div lang="ca" class="section" title="Particionament">
+ <div lang="ca" class="section" title="Particions">
<div class="titlepage">
<div>
<div>
- <h2 class="title"><a name="doPartitionDisks"></a>Particionament
+ <h2 class="title"><a name="doPartitionDisks"></a>Particions
</h2>
</div>
</div>
@@ -30,7 +30,7 @@
<p><a name="doPartitionDisks-pa1"></a>En aquesta pantalla podeu veure en contingut del(s) disc(s) dur(s) i les
- propostes de l'auxiliar de particionament de DrakX sobre on instal&middot;lar
+ propostes de l'auxiliar de particions de DrakX sobre on instal&middot;lar
<span class="application">Mageia</span>.
</p>
@@ -42,8 +42,6 @@
-
-
<p><a name="doPartitionDisks-pa3"></a></p>
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -103,8 +101,6 @@
</p>
-
-
</li>
</ul>
@@ -235,21 +231,17 @@
<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>Si feu servir un sistema de llegat (Legacy, coneguts com a CSB o BIOS) amb
+ un disc GPT, heu de crear una partici&oacute; d'arrencada, boot, si no existeix. &Eacute;s
+ una partici&oacute; d'1 MB sense punt de muntatge. Trieu l'opci&oacute; de "Particions
+ personalitzades de disc" per poder crear-la amb l'instal&middot;lador com qualsevol
+ altra partici&oacute;, nom&eacute;s cal seleccionar "partici&oacute; d'arrencada BIOS" com a
+ tipus de sistema de fitxers.
</p>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
@@ -268,12 +260,12 @@
<p>Alguns discs nous fan servir ara sectors l&ograve;gics de 4096 bytes, en lloc dels
sectors l&ograve;gics de 512 bytes, est&agrave;ndards fins ara. A causa de la manca de
- maquinari disponible, l'eina de particionament utilitzada per l'instal&middot;lador
- no s'ha pogut provar amb un dispositiu d'aquestes caracter&iacute;stiques. A m&eacute;s,
+ maquinari disponible, l'eina de particions utilitzada per l'instal&middot;lador no
+ s'ha pogut provar amb un dispositiu d'aquestes caracter&iacute;stiques. A m&eacute;s,
alguns discs SSD fan servir actualment un bloc d'esborrament de m&eacute;s d'1
- MB. Si teniu algun d'aquests dispositius, us recomanem de fer un
- preparticionament del disc, utilitzant alguna eina de partionament
- alternativa, com ara gparted, i feu servir la configuraci&oacute; seg&uuml;ent:
+ MB. Si teniu algun d'aquests dispositius, us recomanem de fer les particions
+ del disc pr&egrave;viament, utilitzant alguna eina de particions alternativa, com
+ ara gparted, i feu servir la configuraci&oacute; seg&uuml;ent:
</p>
diff --git a/ca/formatPartitions.html b/ca/formatPartitions.html
index efbf7a8..574df34 100644
--- a/ca/formatPartitions.html
+++ b/ca/formatPartitions.html
@@ -6,7 +6,7 @@
<meta name="generator" content="DocBook XSL Stylesheets V1.75.2">
<link rel="home" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="up" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
- <link rel="prev" href="diskdrake.html" title="Particionament personalitzat del disc amb DiskDrake">
+ <link rel="prev" href="diskdrake.html" title="Particions personalitzades del disc amb DiskDrake">
<link rel="next" href="add_supplemental_media.html" title="Selecci&oacute; dels suports (configura suports d'instal&middot;laci&oacute; suplementaris)"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
diff --git a/ca/index.html b/ca/index.html
index 42a49cc..47dc85b 100644
--- a/ca/index.html
+++ b/ca/index.html
@@ -28,8 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducci&oacute;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Suport</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Baixada i comprovaci&oacute; del mitj&agrave;</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Enregistrament o bolcat de l'ISO</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Baixada i comprovaci&oacute; del mitj&agrave;</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Enregistrament o bolcat de l'ISO</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, l'instal&middot;lador de Mageia</a></span></dt>
@@ -50,10 +50,10 @@
<dt><span class="section"><a href="setupSCSI.html">Configuraci&oacute; SCSI</a></span></dt>
<dt><span class="section"><a href="selectInstallClass.html">Instal&middot;laci&oacute; o actualitzaci&oacute;</a></span></dt>
<dt><span class="section"><a href="selectKeyboard.html">Teclat</a></span></dt>
- <dt><span class="section"><a href="doPartitionDisks.html">Particionament</a></span></dt>
+ <dt><span class="section"><a href="doPartitionDisks.html">Particions</a></span></dt>
<dt><span class="section"><a href="ask_mntpoint_s.html">Tria dels punts de muntatge</a></span></dt>
<dt><span class="section"><a href="takeOverHdConfirm.html">Confirmaci&oacute; del disc dur que es formatar&agrave;</a></span></dt>
- <dt><span class="section"><a href="diskdrake.html">Particionament personalitzat del disc amb DiskDrake</a></span></dt>
+ <dt><span class="section"><a href="diskdrake.html">Particions personalitzades del disc amb DiskDrake</a></span></dt>
<dt><span class="section"><a href="formatPartitions.html">Formataci&oacute;</a></span></dt>
<dt><span class="section"><a href="add_supplemental_media.html">Selecci&oacute; dels suports (configura suports d'instal&middot;laci&oacute; suplementaris)</a></span></dt>
<dt><span class="section"><a href="media_selection.html">Selecci&oacute; del suport (Nonfree)</a></span></dt>
@@ -75,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Opcions principals del men&uacute; d'arrencada</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">&Uacute;s del gestor d'arrencada de Mageia</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e924">&Uacute;s d'un gestor d'arrencada existent</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">Opcions</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e900">Bootloader interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e930">&Uacute;s del gestor d'arrencada de Mageia</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e947">&Uacute;s d'un gestor d'arrencada existent</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e950">Using the chain loading</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e967">Opcions</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <dt><span class="section"><a href="setupBootloader.html#d5e883">Bootloader interface</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e907">&Uacute;s del gestor d'arrencada de Mageia</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e921">&Uacute;s d'un gestor d'arrencada existent</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e924">Using chain loading</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e938">Opcions</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Addici&oacute; o modificaci&oacute; d'una entrada al men&uacute; d'arrencada</a></span></dt>
@@ -121,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Desinstal&middot;laci&oacute; de 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#d5e1273">Howto</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Howto</a></span></dt>
</dl>
</dd>
</dl>
diff --git a/ca/selectKeyboard.html b/ca/selectKeyboard.html
index 57f65f1..e4fb0f2 100644
--- a/ca/selectKeyboard.html
+++ b/ca/selectKeyboard.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="up" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="prev" href="selectInstallClass.html" title="Instal&middot;laci&oacute; o actualitzaci&oacute;">
- <link rel="next" href="doPartitionDisks.html" title="Particionament"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="next" href="doPartitionDisks.html" title="Particions"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
diff --git a/ca/setupBootloader.html b/ca/setupBootloader.html
index fcdde84..85c3d0e 100644
--- a/ca/setupBootloader.html
+++ b/ca/setupBootloader.html
@@ -33,11 +33,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h3 class="title"><a name="d5e886"></a>Bootloader interface
-=======
- <h3 class="title"><a name="d5e900"></a>Bootloader interface
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e883"></a>Bootloader interface
</h3>
</div>
</div>
@@ -73,7 +69,7 @@
<tr>
<td align="left" valign="top">
- <p>The Mageia graphical menus are nice :</p>
+ <p>Els men&uacute;s gr&agrave;fics de Mageia s&oacute;n bonics :)</p>
</td>
</tr>
@@ -85,11 +81,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
-=======
- <h4 class="title"><a name="d5e910"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h4 class="title"><a name="d5e893"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
</h4>
</div>
</div>
@@ -97,17 +89,9 @@
-<<<<<<< HEAD
<p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
-=======
-
-
-
-
- <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -116,11 +100,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
-=======
- <h4 class="title"><a name="d5e919"></a>Grub2-efi on UEFI systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h4 class="title"><a name="d5e899"></a>Grub2-efi on UEFI systems
</h4>
</div>
</div>
@@ -135,7 +115,6 @@
-<<<<<<< HEAD
<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
@@ -147,21 +126,6 @@
<p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
-=======
-
-
- <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 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 really knowing what you do.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -172,11 +136,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h3 class="title"><a name="d5e910"></a>&Uacute;s del gestor d'arrencada de Mageia
-=======
- <h3 class="title"><a name="d5e930"></a>&Uacute;s del gestor d'arrencada de Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e907"></a>&Uacute;s del gestor d'arrencada de Mageia
</h3>
</div>
</div>
@@ -211,11 +171,6 @@
<span class="guilabel">Probe Foreign OS</span></p>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -224,11 +179,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h3 class="title"><a name="d5e924"></a>&Uacute;s d'un gestor d'arrencada existent
-=======
- <h3 class="title"><a name="d5e947"></a>&Uacute;s d'un gestor d'arrencada existent
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e921"></a>&Uacute;s d'un gestor d'arrencada existent
</h3>
</div>
</div>
@@ -246,19 +197,11 @@
</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="Using the chain loading">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e950"></a>Using the chain loading
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e924"></a>Using chain loading
</h3>
</div>
</div>
@@ -266,11 +209,7 @@
-<<<<<<< HEAD
<p>If you don't want a bootable Mageia, but to chain load it from another OS,
-=======
- <p>If you don't want a bootable Mageia, but chain load it from another OS,
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
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>.
@@ -279,15 +218,8 @@
-<<<<<<< HEAD
<p>You will get a warning that the bootloader is missing, ignore it by clicking
<span class="guibutton">OK</span>.
-=======
-
-
- <p>You will get a warning that the bootloader will lack, ignore it by a click
- on <span class="guibutton">OK</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -299,11 +231,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h3 class="title"><a name="d5e941"></a>Opcions
-=======
- <h3 class="title"><a name="d5e967"></a>Opcions
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e938"></a>Opcions
</h3>
</div>
</div>
@@ -315,11 +243,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h4 class="title"><a name="d5e943"></a>First page
-=======
- <h4 class="title"><a name="d5e969"></a>First page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h4 class="title"><a name="d5e940"></a>First page
</h4>
</div>
</div>
@@ -340,8 +264,9 @@
<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.
+ bootloader. This means a username and password will be asked at the boot
+ time to select a booting entry or change settings. The username is "root"
+ and the password is the one chosen here after.
</p>
</li>
@@ -370,17 +295,10 @@
<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
-<<<<<<< HEAD
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).
-=======
- stopping unused devices, this was the method used before APM. Uncheck it be
- useful, for example, if your computer does not support ACPI or if you think
- the ACPI implementation might cause some problems (for instance random
- reboots or system lockups).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -403,11 +321,7 @@
<li class="listitem">
<p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
-<<<<<<< HEAD
manages all external interrupts for a specific processor in an SMP system.
-=======
- manage all external interrupts for some specific processor in an SMP system.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -425,11 +339,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
- <h4 class="title"><a name="d5e975"></a>Next page
-=======
- <h4 class="title"><a name="d5e1001"></a>Next page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h4 class="title"><a name="d5e972"></a>Next page
</h4>
</div>
</div>
diff --git a/ca/takeOverHdConfirm.html b/ca/takeOverHdConfirm.html
index 4bda7a1..21bc456 100644
--- a/ca/takeOverHdConfirm.html
+++ b/ca/takeOverHdConfirm.html
@@ -7,7 +7,7 @@
<link rel="home" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="up" href="index.html" title="Instal&middot;laci&oacute; amb DrakX">
<link rel="prev" href="ask_mntpoint_s.html" title="Tria dels punts de muntatge">
- <link rel="next" href="diskdrake.html" title="Particionament personalitzat del disc amb DiskDrake"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="next" href="diskdrake.html" title="Particions personalitzades del disc amb DiskDrake"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
<!--
body { font-family: sans-serif; font-size: 13px }
table { font-family: sans-serif; font-size: 13px }
diff --git a/ca/uninstall-Mageia.html b/ca/uninstall-Mageia.html
index 7e4d71f..4491900 100644
--- a/ca/uninstall-Mageia.html
+++ b/ca/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="d5e1273"></a>Howto
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e1244"></a>Howto
</h3>
</div>
</div>
diff --git a/cs/Select-and-use-ISOs.html b/cs/Select-and-use-ISOs.html
index 71a37b6..6ebb876 100644
--- a/cs/Select-and-use-ISOs.html
+++ b/cs/Select-and-use-ISOs.html
@@ -168,11 +168,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>&#381;iv&eacute; nosi&#269;e
-=======
- <h4 class="title"><a name="d5e56"></a>&#381;iv&eacute; nosi&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -183,11 +179,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>B&#283;&#382;n&eacute; vlastnosti
-=======
- <h5 class="title"><a name="d5e58"></a>B&#283;&#382;n&eacute; vlastnosti
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -205,13 +197,9 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Ka&#382;d&eacute; ISO obsahuje pouze jedno grafick&eacute; prost&#345;ed&iacute; (KDE - Plasma, GNOME nebo
Xfce)
</p>
-=======
- <p>Ka&#382;d&eacute; ISO obsahuje pouze jedno grafick&eacute; prost&#345;ed&iacute; (KDE, GNOME nebo Xfce)</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -240,11 +228,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>&#381;iv&eacute; DVD Plasma
-=======
- <h5 class="title"><a name="d5e72"></a>&#381;iv&eacute; DVD Plasma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -265,11 +249,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Pouze 64 bitov&aacute; architektura.</p>
-=======
- <p>R&#367;zn&eacute; nosi&#269;e pro 32 nebo 64 bitov&eacute; architektury.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -281,11 +261,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>Live DVD GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>Live DVD GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -318,11 +294,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>&#381;iv&eacute; DVD Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>&#381;iv&eacute; DVD Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -357,11 +329,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>Jen zav&aacute;d&#283;c&iacute; nosi&#269;e CD
-=======
- <h4 class="title"><a name="d5e99"></a>Jen zav&aacute;d&#283;c&iacute; nosi&#269;e CD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -372,11 +340,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>B&#283;&#382;n&eacute; vlastnosti
-=======
- <h5 class="title"><a name="d5e101"></a>B&#283;&#382;n&eacute; vlastnosti
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -422,11 +386,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -451,11 +411,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -484,11 +440,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e
-=======
- <h3 class="title"><a name="d5e122"></a>Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -499,11 +451,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>Sta&#382;en&iacute;
-=======
- <h4 class="title"><a name="d5e124"></a>Sta&#382;en&iacute;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -531,11 +479,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>Ov&#283;&#345;ov&aacute;n&iacute; neporu&#353;enosti st&aacute;hnut&eacute;ho nosi&#269;e
-=======
- <h4 class="title"><a name="d5e136"></a>Kontrolov&aacute;n&iacute; neporu&#353;enosti st&aacute;hnut&eacute;ho nosi&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -575,11 +519,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO
-=======
- <h3 class="title"><a name="d5e149"></a>Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -595,11 +535,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>Vyp&aacute;len&iacute; souboru ISO na CD/DVD
-=======
- <h4 class="title"><a name="d5e152"></a>Vyp&aacute;len&iacute; souboru ISO na CD/DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -619,11 +555,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>Zapsat ISO na USB flash
-=======
- <h4 class="title"><a name="d5e157"></a>Zapsat ISO na USB flash
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -661,11 +593,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje v Mageii
-=======
- <h5 class="title"><a name="d5e163"></a>Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje v Mageii
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -680,11 +608,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje ve Windows
-=======
- <h5 class="title"><a name="d5e167"></a>Pou&#382;it&iacute;m grafick&eacute;ho n&aacute;stroje ve Windows
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -706,11 +630,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>Pou&#382;it&iacute;m p&#345;&iacute;kazov&eacute;ho &#345;&aacute;dku v syst&eacute;mu GNU/Linux
-=======
- <h5 class="title"><a name="d5e174"></a>Pou&#382;it&iacute;m p&#345;&iacute;kazov&eacute;ho &#345;&aacute;dku v syst&eacute;mu GNU/Linux
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/cs/addUser.html b/cs/addUser.html
index 7d9f16b..297b530 100644
--- a/cs/addUser.html
+++ b/cs/addUser.html
@@ -23,16 +23,8 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Nastaven&iacute; hesla spr&aacute;vce (u&#382;ivatele root):">
<div class="titlepage">
@@ -146,10 +138,6 @@
<p>Jak&yacute;koliv u&#382;ivatel p&#345;idan&yacute; v pr&#367;b&#283;hu instalace Mageii bude m&iacute;t chr&aacute;n&#283;n
domovsk&yacute; adres&aacute;&#345; proti &#269;ten&iacute; a z&aacute;pisu (umask=0027)
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>M&#367;&#382;ete p&#345;idat v&#353;echny dal&#353;&iacute; pot&#345;ebn&eacute; u&#382;ivatele v kroku <span class="emphasis"><em>Nastaven&iacute; -
Souhrn</em></span> b&#283;hem instalace. Vyberte si <span class="emphasis"><em>Spr&aacute;va
diff --git a/cs/doPartitionDisks.html b/cs/doPartitionDisks.html
index 6ca8380..bf192b4 100644
--- a/cs/doPartitionDisks.html
+++ b/cs/doPartitionDisks.html
@@ -42,8 +42,6 @@
-
-
<p><a name="doPartitionDisks-pa3"></a></p>
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -101,8 +99,6 @@
</p>
-
-
</li>
</ul>
@@ -238,11 +234,6 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/cs/index.html b/cs/index.html
index 65da737..9f2e345 100644
--- a/cs/index.html
+++ b/cs/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">&Uacute;vod</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">M&eacute;dia</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Stahov&aacute;n&iacute; a zkontrolov&aacute;n&iacute; nosi&#269;e</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Vyp&aacute;len&iacute; nebo veps&aacute;n&iacute; souboru ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, instal&aacute;tor Mageii</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Z&aacute;kladn&iacute; nastaven&iacute; zav&aacute;d&#283;c&iacute;ho programu</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e882">Rozhran&iacute; zavad&#283;&#269;e</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e906">Pou&#382;it&iacute; zavad&#283;&#269;e Mageii</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e920">Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;e</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e923">Using chain loading</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e937">Volby</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e899">Rozhran&iacute; zavad&#283;&#269;e</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e929">Pou&#382;it&iacute; zavad&#283;&#269;e Mageii</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e946">Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;e</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e949">Using the chain loading</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e966">Volby</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">P&#345;idan&iacute; nebo zm&#283;na polo&#382;ky v nab&iacute;dce zavad&#283;&#269;e</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Odinstalov&aacute;n&iacute; Mageii</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Jak na to</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1273">Jak na to</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/cs/setupBootloader.html b/cs/setupBootloader.html
index 0ab69c5..5d6bcc6 100644
--- a/cs/setupBootloader.html
+++ b/cs/setupBootloader.html
@@ -33,11 +33,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e882"></a>Rozhran&iacute; zavad&#283;&#269;e
-=======
- <h3 class="title"><a name="d5e899"></a>Rozhran&iacute; zavad&#283;&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -85,11 +81,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e892"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
-=======
- <h4 class="title"><a name="d5e909"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -97,11 +89,6 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Neupravujte "Zav&aacute;d&#283;c&iacute; za&#345;&iacute;zen&iacute;", pokud s jistotou nev&iacute;te, co d&#283;l&aacute;te.</p>
@@ -113,11 +100,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e898"></a>Grub2-efi na UEFI syst&eacute;mech
-=======
- <h4 class="title"><a name="d5e918"></a>Grub2-efi na UEFI syst&eacute;mech
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -132,7 +115,6 @@
-<<<<<<< HEAD
<p>Pokud je Mageia jedin&yacute;m syst&eacute;mem nainstalovan&yacute;m na v&aacute;&#353; po&#269;&iacute;ta&#269;, instal&aacute;tor
vytvo&#345;il ESP (syst&eacute;mov&yacute; odd&iacute;l EFI) pro zaps&aacute;n&iacute; zavad&#283;&#269;e (Grub2-efi). Pokud
ve va&#353;em po&#269;&iacute;ta&#269;i byly u&#382; p&#345;edt&iacute;m nainstalov&aacute;ny opera&#269;n&iacute; syst&eacute;my UEFI
@@ -143,20 +125,6 @@
</p>
-=======
-
-
- <p>Pokud je Mageia prvn&iacute;m syst&eacute;mem nainstalovan&yacute;m na v&aacute;&#353; po&#269;&iacute;ta&#269;, instal&aacute;tor
- vytvo&#345;il ESP (syst&eacute;mov&yacute; odd&iacute;l EFI) pro zaps&aacute;n&iacute; zavad&#283;&#269;e (Grub2-efi). Pokud
- ve va&#353;em po&#269;&iacute;ta&#269;i byly u&#382; p&#345;edt&iacute;m nainstalov&aacute;ny opera&#269;n&iacute; syst&eacute;my UEFI
- (nap&#345;&iacute;klad Windows 8), instal&aacute;tor Mageii zjistil st&aacute;vaj&iacute;c&iacute; ESP vytvo&#345;en&yacute;
- opera&#269;n&iacute;m syst&eacute;mem Windows a p&#345;idal grub2-efi. A&#269;koli je mo&#382;no m&iacute;t v&iacute;ce
- odd&iacute;l&#367; ESP, rad&iacute; se m&iacute;t a sta&#269;&iacute; jen jeden, bez ohledu na po&#269;et opera&#269;n&iacute;ch
- syst&eacute;m&#367;, kter&eacute; m&aacute;te v po&#269;&iacute;ta&#269;i.
- </p>
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Neupravujte "Zav&aacute;d&#283;c&iacute; za&#345;&iacute;zen&iacute;", pokud s jistotou nev&iacute;te, co d&#283;l&aacute;te.</p>
</div>
@@ -168,11 +136,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e906"></a>Pou&#382;it&iacute; zavad&#283;&#269;e Mageii
-=======
- <h3 class="title"><a name="d5e929"></a>Pou&#382;it&iacute; zavad&#283;&#269;e Mageii
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -207,11 +171,6 @@
<span class="guilabel">Probe Foreign OS</span></p>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -220,11 +179,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e920"></a>Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;e
-=======
- <h3 class="title"><a name="d5e946"></a>Pou&#382;it&iacute; u&#382; existuj&iacute;c&iacute;ho zavad&#283;&#269;e
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -242,19 +197,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e923"></a>Using chain loading
-=======
- <div class="section" title="Using the chain loading">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e949"></a>Using the chain loading
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -262,11 +209,7 @@
-<<<<<<< HEAD
<p>If you don't want a bootable Mageia, but to chain load it from another OS,
-=======
- <p>If you don't want a bootable Mageia, but chain load it from another OS,
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
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>.
@@ -275,15 +218,8 @@
-<<<<<<< HEAD
<p>You will get a warning that the bootloader is missing, ignore it by clicking
<span class="guibutton">OK</span>.
-=======
-
-
- <p>You will get a warning that the bootloader will lack, ignore it by a click
- on <span class="guibutton">OK</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -295,11 +231,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e937"></a>Volby
-=======
- <h3 class="title"><a name="d5e966"></a>Volby
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -311,11 +243,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e939"></a>Prvn&iacute; strana
-=======
- <h4 class="title"><a name="d5e968"></a>Prvn&iacute; strana
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -366,17 +294,10 @@
<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
-<<<<<<< HEAD
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).
-=======
- stopping unused devices, this was the method used before APM. Uncheck it be
- useful, for example, if your computer does not support ACPI or if you think
- the ACPI implementation might cause some problems (for instance random
- reboots or system lockups).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -399,11 +320,7 @@
<li class="listitem">
<p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
-<<<<<<< HEAD
manages all external interrupts for a specific processor in an SMP system.
-=======
- manage all external interrupts for some specific processor in an SMP system.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -421,11 +338,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e971"></a>Dal&#353;&iacute; strana
-=======
- <h4 class="title"><a name="d5e1000"></a>Dal&#353;&iacute; strana
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
diff --git a/cs/uninstall-Mageia.html b/cs/uninstall-Mageia.html
index e09c137..4d14827 100644
--- a/cs/uninstall-Mageia.html
+++ b/cs/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1244"></a>Jak na to
-=======
- <h3 class="title"><a name="d5e1273"></a>Jak na to
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/de/Select-and-use-ISOs.html b/de/Select-and-use-ISOs.html
index f77a91d..01beeb6 100644
--- a/de/Select-and-use-ISOs.html
+++ b/de/Select-and-use-ISOs.html
@@ -173,11 +173,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>Live Medien
-=======
- <h4 class="title"><a name="d5e56"></a>Live Medien
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -188,11 +184,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>Grunds&auml;tzliche Eigenschaften
-=======
- <h5 class="title"><a name="d5e58"></a>Grunds&auml;tzliche Eigenschaften
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -211,11 +203,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Jede ISO enth&auml;lt nur eine Desktop-Umgebung (Plasma, GNOME oder Xfce).</p>
-=======
- <p>Jede ISO enth&auml;lt nur eine Desktop-Umgebung (KDE, GNOME oder Xfce).</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -244,11 +232,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>Live-DVD Plasma
-=======
- <h5 class="title"><a name="d5e72"></a>Live-DVD Plasma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -269,11 +253,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Nur 64-Bit-Architektur.</p>
-=======
- <p>Verschiedene Medien f&uuml;r 32- oder 64-Bit-Architekturen.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -285,11 +265,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>Live-DVD GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>Live-DVD GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -322,11 +298,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>Live-DVD Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>Live-DVD Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -361,11 +333,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>Boot-only CD Medien
-=======
- <h4 class="title"><a name="d5e99"></a>Boot-only CD Medien
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -376,11 +344,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>Grunds&auml;tzliche Eigenschaften
-=======
- <h5 class="title"><a name="d5e101"></a>Grunds&auml;tzliche Eigenschaften
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -426,11 +390,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -455,11 +415,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -488,11 +444,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>Medien herunterladen und &uuml;berpr&uuml;fen
-=======
- <h3 class="title"><a name="d5e122"></a>Medien herunterladen und &uuml;berpr&uuml;fen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -503,11 +455,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>Herunterladen
-=======
- <h4 class="title"><a name="d5e124"></a>Herunterladen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -537,11 +485,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>&Uuml;berpr&uuml;fen der integrit&auml;t der heruntergeladenen Datei
-=======
- <h4 class="title"><a name="d5e136"></a>&Uuml;berpr&uuml;fen der integriet&auml;t der heruntergeladenen Datei
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -584,11 +528,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>Brennen oder &uuml;bertragen der ISO
-=======
- <h3 class="title"><a name="d5e149"></a>Brennen oder &uuml;bertragen der ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -604,11 +544,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>ISO auf eine CD/DVD brennen
-=======
- <h4 class="title"><a name="d5e152"></a>ISO auf eine CD/DVD brennen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -628,11 +564,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>ISO auf einen USB-Stick &uuml;bertragen
-=======
- <h4 class="title"><a name="d5e157"></a>ISO auf einen USB-Stick &uuml;bertragen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -670,11 +602,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Verwenden eines grafischen Werkzeugs in Mageia
-=======
- <h5 class="title"><a name="d5e163"></a>Verwenden eines grafischen Werkzeugs in Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -689,11 +617,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Verwenden eines grafischen Werkzeugs in Windows
-=======
- <h5 class="title"><a name="d5e167"></a>Verwenden eines grafischen Werkzeugs in Windows
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -715,11 +639,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>Verwenden der Befehlszeile in einem GNU/Linux System
-=======
- <h5 class="title"><a name="d5e174"></a>Verwenden der Befehlzeile in einem GNU/Linux System
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/de/addUser.html b/de/addUser.html
index 20ee737..a99f8ec 100644
--- a/de/addUser.html
+++ b/de/addUser.html
@@ -23,16 +23,8 @@
</div>
</div>
-<<<<<<< HEAD
-=======
-
-
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="Setzen des Administrator (root) Passworts:">
<div class="titlepage">
@@ -151,20 +143,12 @@
<p>Jeder Nutzer, der bei der Installation von Mageia hinzugef&uuml;gt wird, erh&auml;lt
ein lese- und schreibgesch&uuml;tztes home Verzeichnis (umask=0027).
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Sie k&ouml;nnen zus&auml;tzliche Zug&auml;nge f&uuml;r weitere Benutzer im
<span class="emphasis"><em>Konfiguration - Zusammenfassung</em></span> Bildschirm, w&auml;hrend der
Installation, hinzuf&uuml;gen. W&auml;hle hierf&uuml;r die
<span class="emphasis"><em>Benutzerverwaltung</em></span> aus.
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Die Zugriffsrechte k&ouml;nnen auch nach der Installation abge&auml;ndert werden.</p>
diff --git a/de/choosePackageGroups.html b/de/choosePackageGroups.html
index a7962f0..97f0ac0 100644
--- a/de/choosePackageGroups.html
+++ b/de/choosePackageGroups.html
@@ -51,22 +51,13 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Grafische Umgebung</p>
-=======
- <p>Grafische Umgebung.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Individuelle Paketauswahl: Um h&auml;ndisch Pakete hinzuzuf&uuml;gen oder entfernen zu
k&ouml;nnen, w&auml;hlen Sie bitte diese Option.
-=======
- <p>Individuelle Paketauswahl (Um h&auml;ndisch Pakete hinzuzuf&uuml;gen oder entfernen zu
- k&ouml;nnen, w&auml;hlen Sie bitte diese Option.)
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
diff --git a/de/doPartitionDisks.html b/de/doPartitionDisks.html
index 4ba5338..b1bae49 100644
--- a/de/doPartitionDisks.html
+++ b/de/doPartitionDisks.html
@@ -42,8 +42,6 @@
-
-
<p><a name="doPartitionDisks-pa3"></a></p>
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -107,8 +105,6 @@
</p>
-
-
</li>
</ul>
@@ -243,30 +239,17 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem
GPT-Laufwerk verwenden, m&uuml;ssen Sie eine BIOS Bootpartition erstellen, falls
noch keine vorhanden ist. Es ist eine ungef&auml;hr 1 MiB gro&szlig;e Partition ohne
einen Einh&auml;ngepunkt. W&auml;hle die "Benutzerdefinierte Partitionierung" um diese
&uuml;ber das Installationsprogramm zu erstellen, wie dies auch bei den anderen
-=======
- <p>Falls Sie ein Legacy System (bekannt als CSM oder BIOS) mit einem GPT
- Laufwerk verwenden, m&uuml;ssen Sie eine BIOS Bootpartition erstellen, falls noch
- keine vorhanden ist. Es ist eine ungef&auml;hr 1 MiB gro&szlig;e Partition ohne einen
- Einh&auml;ngepunkt. W&auml;hle die "Benutzerdefinierte Partitionierung" um diese &uuml;ber
- das Installationsprogramm zu erstellen, wie dies auch bei den anderen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
Partitionen geschieht. W&auml;hle als Dateisystem "BIOS boot partition" aus.
</p>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/de/index.html b/de/index.html
index bfa490e..ad9b410 100644
--- a/de/index.html
+++ b/de/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Einleitung</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medien</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Medien herunterladen und &uuml;berpr&uuml;fen</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Brennen oder &uuml;bertragen der ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Medien herunterladen und &uuml;berpr&uuml;fen</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Brennen oder &uuml;bertragen der ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, das Mageia Installationsprogramm</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Hauptoptionen des Bootloaders</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e902">Bootloader Oberfl&auml;che</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e926">Verwenden des Mageia Bootloaders</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e940">Verwenden eines bestehenden Bootloaders</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e943">Verwenden des Chain-Loader</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e957">Optionen</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e919">Bootloader interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e949">Verwenden des Mageia Bootloaders</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e966">Verwenden eines bestehenden Bootloaders</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e969">Verwenden des Chain-Loader</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e986">Optionen</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Hinzuf&uuml;gen oder &auml;ndern eines Boot Men&uuml; Eintrags</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Mageia deinstallieren</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1264">Kurzanleitung</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1293">Kurzanleitung</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/de/misc-params.html b/de/misc-params.html
index 5b95a67..cf134e8 100644
--- a/de/misc-params.html
+++ b/de/misc-params.html
@@ -199,14 +199,9 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Wenn Sie feststellen, dass ein falsches Tastaturlayout verwendet wird und
Sie dieses &auml;ndern m&ouml;chten, beachten Sie, das sich Ihr Passwort hierdurch
auch &auml;ndert.
-=======
- <p>If you notice a wrong keyboard layout and want to change it, keep in mind
- that your passwords are going to change too.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</td>
diff --git a/de/selectCountry.html b/de/selectCountry.html
index 64be86c..4ea6e2f 100644
--- a/de/selectCountry.html
+++ b/de/selectCountry.html
@@ -32,11 +32,7 @@
<p><a name="selectCountry-pa1"></a>W&auml;hlen Sie Ihr Land oder Ihre Region. Dies ist f&uuml;r alle Einstellungen n&ouml;tig,
wie f&uuml;r die W&auml;hrung und die f&uuml;r dieses Land g&uuml;ltigen Einstellungen des
Funknetzes. W&auml;hlen Sie das falsche Land aus, kann dies zu einer Fehlfunktion
-<<<<<<< HEAD
des WLAN f&uuml;hren.
-=======
- des WLANs f&uuml;hren.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -79,7 +75,6 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa4"></a>Im <span class="guilabel">Andere L&auml;nder</span> Bildschirm k&ouml;nnen Sie weitere
Eingabemethoden ausw&auml;hlen (am unteren Ende der Liste). Eingabemethoden
erlauben es den Benutzern, multilinguale Zeichen (Chinesisch, Japanisch,
@@ -88,15 +83,6 @@
Eingabemethoden (SCIM, GIN, HIME, usw.) bieten &auml;hnliche Funktionen an und
k&ouml;nnen installiert werden, wenn Sie die HTTP/FTP Medien hinzugef&uuml;gt haben,
bevor Sie diese Pakete ausw&auml;hlen.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
diff --git a/de/setupBootloader.html b/de/setupBootloader.html
index d9600bd..47b927c 100644
--- a/de/setupBootloader.html
+++ b/de/setupBootloader.html
@@ -29,19 +29,11 @@
-<<<<<<< HEAD
<div class="section" title="Bootloader Oberfl&auml;che">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e902"></a>Bootloader Oberfl&auml;che
-=======
- <div class="section" title="Bootloader interface">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e919"></a>Bootloader interface
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -49,11 +41,7 @@
-<<<<<<< HEAD
<p>Standardm&auml;&szlig;ig verwendet Mageia ausschlie&szlig;lich:</p>
-=======
- <p>By default, Mageia uses exclusively:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
@@ -95,11 +83,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e912"></a>Grub2 auf Legacy/MBR und Legacy/GPT Systeme
-=======
- <h4 class="title"><a name="d5e929"></a>Grub2 auf Legacy/MBR und Legacy/GPT Systeme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -107,17 +91,9 @@
-<<<<<<< HEAD
<p>&Auml;ndern Sie nicht das Boot-Medium, au&szlig;er Sie wissen genau, was Sie tun.</p>
-=======
-
-
-
-
- <p>&Auml;nderen Sie nicht das Boot-Medium, au&szlig;er Sie wissen genau, was Sie tun.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -126,11 +102,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e918"></a>Grub2-efi auf UEFI Systeme
-=======
- <h4 class="title"><a name="d5e938"></a>Grub2-efi auf UEFI Systeme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -145,7 +117,6 @@
-<<<<<<< HEAD
<p>Wenn Mageia das einzige Betriebssystem ist, welches auf Ihrem Computer
installiert ist, dann hat das Installationsprogramm eine ESP
(EFI-Systempartition) erstellt, um dort den Bootloader (Grub2-efi) zu
@@ -159,22 +130,6 @@
<p>&Auml;ndern Sie nicht das Boot-Medium, au&szlig;er Sie wissen genau, was Sie tun.</p>
-=======
-
-
- <p>Wenn Mageia das erste System, welches auf Ihrem Computer installiert ist,
- dann hat das Installationsprogramm eine ESP (EFI System Partition) erstellt
- um dort den Bootloader (Grub2-efi) zu speichern. Falls bereits ein UEFI
- Betriebssystem auf Ihrem Computer vorhanden war (z.B. Windows 8), erkennt
- das Mageia Installationsprogramm die bestehende ESP, welche von Windows
- erstellt wurde, und f&uuml;gt grub2-efi hinzu. Es ist auch m&ouml;glich mehrere ESPs
- zu haben, jedoch wird generell nur eine ben&ouml;tigt und diese ist auch
- ausreichend, egal wie viele Betriebssysteme Sie verwenden.
- </p>
-
-
- <p>&Auml;nderen Sie nicht das Boot-Medium, au&szlig;er Sie wissen genau, was Sie tun.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -185,11 +140,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e926"></a>Verwenden des Mageia Bootloaders
-=======
- <h3 class="title"><a name="d5e949"></a>Verwenden des Mageia Bootloaders
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -224,11 +175,6 @@
<span class="guilabel">Fremdes OS testen</span></p>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -237,11 +183,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e940"></a>Verwenden eines bestehenden Bootloaders
-=======
- <h3 class="title"><a name="d5e966"></a>Verwenden eines bestehenden Bootloaders
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -264,11 +206,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e943"></a>Verwenden des Chain-Loader
-=======
- <h3 class="title"><a name="d5e969"></a>Verwenden des Chain-Loader
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -276,32 +214,18 @@
-<<<<<<< HEAD
<p>Falls Sie kein bootbares Mageia haben m&ouml;chten, dieses jedoch &uuml;ber den
Chainloader eines anderen Betriebssystem starten m&ouml;chten, klicke auf
<span class="guibutton">Weiter</span>, anschlie&szlig;end auf
<span class="guilabel">Fortgeschritten</span> und w&auml;hle die Box <span class="guilabel">Ver&auml;ndere
nichts an der ESP oder dem MBR</span> aus.
-=======
- <p>If you don't want a bootable Mageia, but 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>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>Sie werden eine Warnmeldung erhalten, dass der Bootloader fehlt. Ignorieren
Sie diese Meldung indem Sie auf <span class="guibutton">OK</span> dr&uuml;cken.
-=======
-
-
- <p>You will get a warning that the bootloader will lack, ignore it by a click
- on <span class="guibutton">OK</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -313,11 +237,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e957"></a>Optionen
-=======
- <h3 class="title"><a name="d5e986"></a>Optionen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -329,11 +249,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e959"></a>Erste Seite
-=======
- <h4 class="title"><a name="d5e988"></a>Erste Seite
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -353,17 +269,11 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Sicherheit</span>: Dies erlaubt Ihnen ein Passwort f&uuml;r den
Bootloader festzulegen. Dies bedeutet, dass der Benutzername und das
Passwort beim Startvorgang abfragt wird, wenn ein Booteintrag ausgew&auml;hlt
wird oder Einstellungen ge&auml;ndert werden. Der Benutzername ist "root" und das
Passwort ist welches, dass Sie in diesem Abschnitt festlegen k&ouml;nnen.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -390,7 +300,6 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">ACPI aktivieren:</span> ACPI (Advanced Configuration and Power
Interface) ist ein Standard f&uuml;r die Energieverwaltung. Es kann durch das
Abschalten von ungenutzten Ger&auml;ten Strom sparen, was eine Methode ist,
@@ -398,55 +307,30 @@
n&uuml;tzlich sein wenn, zum Beispiel, Ihr Computer ACPI nicht unterst&uuml;tzt oder
falls Sie finden, dass die ACPI Implementierung einige Probleme verursacht
(als Beispiel w&auml;ren zuf&auml;llige Neustarts oder Systemh&auml;nger).
-=======
- <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. Uncheck it be
- useful, for example, if your computer does not support ACPI or if you think
- the ACPI implementation might cause some problems (for instance random
- reboots or system lockups).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">SMP aktivieren</span>: Diese Auswahl aktiviert / deaktiviert
das symmetrische Multiprocessing f&uuml;r Multiprozessorsysteme.
-=======
- <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
- multiprocessing for multi core processors.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">APIC aktivieren</span>: Aktivieren oder deaktivierten dieser
Option erlaubt dem Betriebssystem Zugriff auf den Advanced Programmable
Interrupt Controller. APIC Ger&auml;te erlauben ein weitaus komplexeres
Priorit&auml;tenmodell und erweiterte IRC (Interrupt Request) Verwaltung.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Lokales APIC aktivieren</span>: Hier k&ouml;nnen Sie das lokale
APIC ausw&auml;hlen, welches alle externen Interrupts (Unterbrechungen) f&uuml;r einen
bestimmten Prozessor in einem SMP System verwaltet.
-=======
- <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
- manage all external interrupts for some specific processor in an SMP system.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -464,11 +348,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e991"></a>N&auml;chste Seite
-=======
- <h4 class="title"><a name="d5e1020"></a>N&auml;chste Seite
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -480,25 +360,16 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Standard:</span> Das Betriebssystem das als Standardsystem
voreingestellt werden soll
-=======
- <p><span class="guilabel">Default:</span> Operating system started up by default
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Hinzuf&uuml;gen/Erweitern:</span> Mit dieser Option k&ouml;nnen Sie
Kernel-Einstellungen einrichten oder dem Kernel die Anweisung geben, mehr
Informationen beim Booten zu geben.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -514,27 +385,17 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Video-Modus:</span> Diese legt die Bildschirmaufl&ouml;sung und
Farbtiefe des Bootmen&uuml;s fest. Wenn Sie auf das nach unten zeigende Dreieck
klicken werden Ihnen weitere Aufl&ouml;sungen und Farbtiefen angezeigt.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="bold"><strong>Ver&auml;ndere nichts an der ESP oder dem MBR</strong></span>:
siehe oben, <a class="link" href="setupBootloader.html#setupChainLoading">Verwenden des
Chain-Loader</a></p>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
diff --git a/de/uninstall-Mageia.html b/de/uninstall-Mageia.html
index 14aed30..e623d0c 100644
--- a/de/uninstall-Mageia.html
+++ b/de/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1264"></a>Kurzanleitung
-=======
- <h3 class="title"><a name="d5e1293"></a>Kurzanleitung
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/es/Select-and-use-ISOs.html b/es/Select-and-use-ISOs.html
index 2e318b0..13c3742 100644
--- a/es/Select-and-use-ISOs.html
+++ b/es/Select-and-use-ISOs.html
@@ -136,27 +136,6 @@
</p>
</li>
-<<<<<<< HEAD
-=======
- </ul>
- </div>
-
- </div>
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>Medios diferentes para arquitecturas de 32 o 64 bits.</p>
@@ -192,11 +171,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>Medio Live
-=======
- <h4 class="title"><a name="d5e56"></a>Medio Live
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -207,11 +182,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>Caracter&#347;ticas comunes.
-=======
- <h5 class="title"><a name="d5e58"></a>Caracter&#347;ticas comunes.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -230,11 +201,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Cada ISO contiene s&oacute;lo un entorno de escritorio (Plasma, GNOME o Xfce).</p>
-=======
- <p>Each ISO contains only one desktop environment (KDE, GNOME or Xfce).</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -259,19 +226,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="DVD Live Plasma">
<div class="titlepage">
<div>
<div>
<h5 class="title"><a name="d5e69"></a>DVD Live Plasma
-=======
- <div class="section" title="Live DVD Plasma">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e72"></a>Live DVD Plasma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -282,11 +241,7 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Solo entorno de escritorio Plasma</p>
-=======
- <p>Plasma desktop environment only.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -296,11 +251,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Arquitectura de 64 bits solamente.</p>
-=======
- <p>Medios diferentes para arquitecturas de 32 o 64 bits.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -312,11 +263,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>Live DVD GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>Live DVD GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -345,19 +292,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="DVD Live Xfce">
<div class="titlepage">
<div>
<div>
<h5 class="title"><a name="d5e87"></a>DVD Live Xfce
-=======
- <div class="section" title="Live DVD Xfce">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e90"></a>Live DVD Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -368,11 +307,7 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Solo entorno de escritorio Xfce</p>
-=======
- <p>Xfce desktop environment only.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -396,11 +331,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>Medio CD s&oacute;lo de arranque
-=======
- <h4 class="title"><a name="d5e99"></a>Medio CD s&oacute;lo de arranque
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -411,11 +342,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>Caracter&#347;ticas comunes.
-=======
- <h5 class="title"><a name="d5e101"></a>Caracter&#347;ticas comunes.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -461,11 +388,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -490,11 +413,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -523,11 +442,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>Descargando y verificando medios.
-=======
- <h3 class="title"><a name="d5e122"></a>Descargando y verificando medios.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -538,11 +453,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>Descargando
-=======
- <h4 class="title"><a name="d5e124"></a>Descargando
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -556,15 +467,9 @@
</p>
-<<<<<<< HEAD
<p>Md5sum y sha1sum son herramientas para comprobar la integridad ISO. Utilice
s&oacute;lo una de ellas. Mantenga una de ellas <a class="link" href="Select-and-use-ISOs.html#integrity">para uso
posterior</a>. A continuaci&oacute;n, aparece una ventana similar a &eacute;sta:
-=======
- <p>md5sum y sha1sum son herramientas para comprobar la integridad de las
- ISO. Use solo una de ellas. Guarde una de ellas <a class="link" href="Select-and-use-ISOs.html#integrity">para uso posterior</a>. Entonces aparece esta
- ventana:
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -576,32 +481,19 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>Comprobando la integridad de los medios descargados
-=======
- <h4 class="title"><a name="d5e136"></a>Verificar integridad del medio descargado
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
</div>
-<<<<<<< HEAD
<p>Ambas sumas de comprobaci&oacute;n son n&uacute;meros hexadecimales calculados mediante un
algoritmo del archivo que se va a descargar. Cuando solicita que estos
algoritmos recalculen este n&uacute;mero desde su archivo descargado, tiene el
mismo n&uacute;mero y el archivo descargado es correcto o el n&uacute;mero es diferente y
tiene un error. Un error indica que debe volver a intentar la descarga o
intentar una reparaci&oacute;n utilizando BitTorrent.
-=======
- <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
- failure. A failure infers that you should retry the download or attempt a
- repair using BitTorrent.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Abra una consola, no es necesario ser root, y:</p>
@@ -627,11 +519,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>Grabar o volcar el ISO
-=======
- <h3 class="title"><a name="d5e149"></a>Grabar o volcar el ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -647,11 +535,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>Grabar el ISO en un CD/DVD
-=======
- <h4 class="title"><a name="d5e152"></a>Grabar el ISO en un CD/DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -671,11 +555,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>Volvar el ISO en un USB
-=======
- <h4 class="title"><a name="d5e157"></a>Volvar el ISO en un USB
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -713,11 +593,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Usando una herramienta gr&aacute;fica dentro de Mageia
-=======
- <h5 class="title"><a name="d5e163"></a>Usando una herramienta gr&aacute;fica dentro de Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -732,11 +608,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Usando una herramienta gr&aacute;fica dentro de Windows
-=======
- <h5 class="title"><a name="d5e167"></a>Usando una herramienta gr&aacute;fica dentro de Windows
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -758,11 +630,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>Usando la L&iacute;nea de comandos dentro de un sistema GNU/Linux
-=======
- <h5 class="title"><a name="d5e174"></a>Usando la L&iacute;nea de comandos dentro de un sistema GNU/Linux
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/es/addUser.html b/es/addUser.html
index 173743d..a68cfbf 100644
--- a/es/addUser.html
+++ b/es/addUser.html
@@ -141,15 +141,9 @@
de inicio protegido tanto de lectura como de escritura (umask=0027).
</p>
-<<<<<<< HEAD
<p>Puede agregar todos los usuarios adicionales necesarios en el paso
<span class="emphasis"><em>Configuraci&oacute;n - Resumen</em></span> durante la instalaci&oacute;n. Elija
<span class="emphasis"><em>Gesti&oacute;n de usuarios</em></span>.
-=======
- <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>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Los permisos de acceso se pueden cambiar tambi&eacute;n tras la instalaci&oacute;n.</p>
diff --git a/es/choosePackageGroups.html b/es/choosePackageGroups.html
index 1bd1a5a..9be94fd 100644
--- a/es/choosePackageGroups.html
+++ b/es/choosePackageGroups.html
@@ -64,13 +64,8 @@
</div>
-<<<<<<< HEAD
<p>Lea <a class="xref" href="minimal-install.html" title="Instalaci&oacute;n m&iacute;nima.">&#8220;Instalaci&oacute;n m&iacute;nima.&#8221;</a> para obtener instrucciones sobre
c&oacute;mo realizar una instalaci&oacute;n m&iacute;nima (sin o con X &amp; IceWM).
-=======
- <p>Read <a class="xref" href="minimal-install.html" title="Instalaci&oacute;n m&iacute;nima.">&#8220;Instalaci&oacute;n m&iacute;nima.&#8221;</a> for instructions on how to do a
- minimal install (without or with X &amp; IceWM).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</div>
diff --git a/es/diskdrake.html b/es/diskdrake.html
index f77fc58..e89be2e 100644
--- a/es/diskdrake.html
+++ b/es/diskdrake.html
@@ -89,14 +89,9 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Si est&aacute; instalando Mageia en un ordenador con UEFI, compruebe que existe una
partici&oacute;n ESP (EFI System Partition) correctamente montada en /boot/EFI (ver
m&aacute;s abajo)
-=======
- <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI
- System Partition) is present and correctly mounted on /boot/EFI (see below)
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -117,13 +112,8 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Si est&aacute; instalando Mageia en un sistema Legacy/GPT, compruebe que existe una
partici&oacute;n BIOS de arranque de tipo correcto
-=======
- <p>If you are installing Mageia on a Legacy/GPT system, check that a BIOS boot
- partition is present with a correct type
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
diff --git a/es/doPartitionDisks.html b/es/doPartitionDisks.html
index 79bc48a..dfea4f3 100644
--- a/es/doPartitionDisks.html
+++ b/es/doPartitionDisks.html
@@ -232,20 +232,12 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Si est&aacute; usando un sistema Legacy (conocido como CSM o BIOS) con un disco
GPT, necesita creat una partici&oacute;n de arranque BIOS, en caso de que no
exista. Es una partici&oacute;n de alrededor de 1 MiB sin punto de montaje. Escoja
la opci&oacute;n "Particionado personalizado del disco" para poder crearla con el
instalador como cualquier otra partici&oacute;n. Simplemente seleccione partici&oacute;n
de arranque BIOS como sistema de archivos.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
diff --git a/es/index.html b/es/index.html
index 47ec11f..0a893c8 100644
--- a/es/index.html
+++ b/es/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducci&oacute;n</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medio</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Descargando y verificando medios.</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Grabar o volcar el ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Descargando y verificando medios.</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Grabar o volcar el ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, el instalador de Mageia</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Opciones principales del cargador de arranque</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e877">Interfaz del cargador de arranque</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e901">Usando el cargador de arranque de Mageia</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e915">Usando un cargador de arranque existente</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e918">Carga en uso</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e932">Opciones</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e880">Bootloader interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e904">Usando el cargador de arranque de Mageia</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e918">Usando un cargador de arranque existente</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e921">Using chain loading</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e935">Opciones</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Agregando o modificando una entrada en el men&uacute; de arranque</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Desinstalando Mageia</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1238">Guias</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1241">Guias</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/es/misc-params.html b/es/misc-params.html
index 3a91ccc..dbab1fa 100644
--- a/es/misc-params.html
+++ b/es/misc-params.html
@@ -44,41 +44,24 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Como regla general, se recomienda la configuraci&oacute;n por defecto, que se puede
manterner salvo 3 excepciones:
-=======
- <p>As a general rule, default settings are recommended and you can keep them
- with 3 exceptions:
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>se conocen algunos problemas en la configuraci&oacute;n por defecto</p>
-=======
- <p>there are known issues with a default setting</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>la configuraci&oacute;n por defecto se ha probado ya y falla</p>
-=======
- <p>the default setting has already been tried and it fails</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>se da m&aacute;s informaci&oacute;n en las secciones siguientes</p>
-=======
- <p>something else is said in the detailed sections below</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -133,11 +116,7 @@
</p>
-<<<<<<< HEAD
<p><a name="misc-params-system-pa4b"></a>No cambie nada, a menos que sepa como configurar Grub2
-=======
- <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -215,13 +194,8 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Si nota una configuraci&oacute;n err&oacute;nea de teclado y quiere cambiarla, tenga en
cuenta que las contrase&ntilde;as cambiar&aacute;n tambi&eacute;n.
-=======
- <p>If you notice a wrong keyboard layout and want to change it, keep in mind
- that your passwords are going to change too.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</td>
@@ -386,15 +360,9 @@
</p>
-<<<<<<< HEAD
<p><a name="misc-params-security-pa2b"></a>Seleccione los servicios que desea tener acceso a su sistema. Sus
selecciones depender&aacute;n de lo que utilice su computadora. Para obtener m&aacute;s
informaci&oacute;n, consulte <a class="xref" href="">???</a>.
-=======
- <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your
- selections will depend on what you use your computer for. For more
- information, see <a class="xref" href="">???</a>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
diff --git a/es/selectCountry.html b/es/selectCountry.html
index 039c750..df8d7dc 100644
--- a/es/selectCountry.html
+++ b/es/selectCountry.html
@@ -29,15 +29,9 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa1"></a>Elija su pa&iacute;s o regi&oacute;n. Esto es importante para todo tipo de
configuraciones, como la moneda o la red wifi. Elegir el pa&iacute;s incorrecto
puede hacer que no pueda usar una red inal&aacute;mbrica.
-=======
- <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
- like the currency and wireless regulatory domain. Setting the wrong country
- can lead to not being able to use a Wireless network.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -79,7 +73,6 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa4"></a>En la pantalla <span class="guilabel">Otros pa&iacute;ses</span> tambi&eacute;n puede seleccionar
un m&eacute;todo de entrada (en la parte inferior de la lista). Los m&eacute;todos de
entrada permiten a los usuarios introducir caracteres multiling&uuml;es (chino,
@@ -87,15 +80,6 @@
que los usuarios no deben configurarlo manualmente. Otros m&eacute;todos de entrada
(SCIM, GCIN, HIME, etc) tambi&eacute;n proporcionan funciones similares y se pueden
instalar si agreg&oacute; medios HTTP / FTP antes de la selecci&oacute;n de paquetes.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -108,15 +92,9 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p><a name="selectCountry-pa5"></a>Si se perdi&oacute; la configuraci&oacute;n del m&eacute;todo de entrada durante la instalaci&oacute;n,
puede acceder a ella despu&eacute;s de arrancar el sistema instalado a trav&eacute;s de
"Configurar su computadora" -&gt; "Sistema" o ejecutando localedrake como root.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</td>
diff --git a/es/setupBootloader.html b/es/setupBootloader.html
index 5ed2a4b..5bc9cb8 100644
--- a/es/setupBootloader.html
+++ b/es/setupBootloader.html
@@ -29,19 +29,11 @@
-<<<<<<< HEAD
<div class="section" title="Interfaz del cargador de arranque">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e877"></a>Interfaz del cargador de arranque
-=======
- <div class="section" title="Bootloader interface">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e880"></a>Bootloader interface
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -49,31 +41,19 @@
-<<<<<<< HEAD
<p>Por defecto, Mageia usa exclusivamente:</p>
-=======
- <p>By default, Mageia uses exclusively:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Grub2 (con o sin men&uacute; gr&aacute;fico) para sistemas Legacy/MBR o Legacy/GPT</p>
-=======
- <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Grub2-efi para un sistema UEFI.</p>
-=======
- <p>Grub2-efi for a UEFI system.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -97,19 +77,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Grub2 en sistemas Legacy/MBR y Legacy/GPT">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e887"></a>Grub2 en sistemas Legacy/MBR y Legacy/GPT
-=======
- <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e890"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -126,19 +98,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Grub2-efi en sistemas UEFI">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e893"></a>Grub2-efi en sistemas UEFI
-=======
- <div class="section" title="Grub2-efi on UEFI systems">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e896"></a>Grub2-efi on UEFI systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -146,19 +110,13 @@
-<<<<<<< HEAD
<p>Con un sistema UEFI, la interfaz de usuario es ligeramente diferente ya que
no se puede elegir entre con o sin men&uacute; gr&aacute;fico
-=======
- <p>With an UEFI system, the user interface is slightly different as you cannot
- choose between with or without graphical menu
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>Si Mageia es el &uacute;nico sistema instalado en su computadora, el instalador
crear&aacute; una ESP (EFI System Partition) para instalar el gestor de arranque
(Grub2-efi). Si ya hay sistemas operativos UEFI instalados en su computadora
@@ -166,15 +124,6 @@
creado por Windows y agrega grub2-efi. Aunque es posible tener varios ESP,
solo uno es aconsejable y suficiente sea cual sea el n&uacute;mero de sistemas
operativos que tenga.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -191,11 +140,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e901"></a>Usando el cargador de arranque de Mageia
-=======
- <h3 class="title"><a name="d5e904"></a>Usando el cargador de arranque de Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -203,52 +148,32 @@
-<<<<<<< HEAD
<p>Por defecto, seg&uacute;n su sistema, Mageia escribe un nuevo:</p>
-=======
- <p>By default, according to your system, Mageia writes a new:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>GRUB2 en el MBR (Master Boot Record) de su primer disco duro o en la
partici&oacute;n de arranque del BIOS.
-=======
- <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
- drive or in the BIOS boot partition.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Cargador de arranque Grub2-efi en el ESP</p>
-=======
- <p>Grub2-efi bootloader into the ESP</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
</div>
-<<<<<<< HEAD
<p>Si ya tiene instalados otros sistemas operativos, Mageia intentar&aacute;
agregarlos al nuevo men&uacute; de inicio de Mageia. Si no desea este
comportamiento, haga clic en <span class="guibutton">Siguiente</span> y, a
continuaci&oacute;n, desmarque la casilla <span class="guilabel">Sondear otros sistemas
operativos</span></p>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -259,11 +184,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e915"></a>Usando un cargador de arranque existente
-=======
- <h3 class="title"><a name="d5e918"></a>Usando un cargador de arranque existente
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -281,19 +202,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Carga en uso">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e918"></a>Carga en uso
-=======
- <div class="section" title="Using chain loading">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e921"></a>Using chain loading
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -301,29 +214,17 @@
-<<<<<<< HEAD
<p>Si no desea un arranque de Mageia, sino que inicie desde otro SO, haga clic
en <span class="guibutton">Siguiente</span>, luego en
<span class="guibutton">Avanzado</span> y marque la casilla <span class="guilabel">No toque ESP o
MBR</span>.
-=======
- <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>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>Obtendr&aacute; una advertencia de que falta el cargador de arranque, ign&oacute;relo
haciendo clic en <span class="guibutton">Aceptar</span>.
-=======
- <p>You will get a warning that the bootloader is missing, ignore it by clicking
- <span class="guibutton">OK</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -335,11 +236,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e932"></a>Opciones
-=======
- <h3 class="title"><a name="d5e935"></a>Opciones
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -347,19 +244,11 @@
-<<<<<<< HEAD
<div class="section" title="Primera p&aacute;gina">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e934"></a>Primera p&aacute;gina
-=======
- <div class="section" title="First page">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e937"></a>First page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -371,72 +260,45 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Retardo antes de arrancar la imagen predeterminada</span>:
Este cuadro de texto le permite establecer un retraso en segundos antes de
que se inicie el sistema operativo predeterminado.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Seguridad</span>: Permite establecer una contrase&ntilde;a para el
gestor de arranque. Esto significa que se le pedir&aacute; un nombre de usuario y
una contrase&ntilde;a durante el arranque para seleccionar una entrada de inicio o
cambiar la configuraci&oacute;n. El nombre de usuario es "root" y la contrase&ntilde;a es
la elegida aqu&iacute; despu&eacute;s.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Contrase&ntilde;a</span>: este cuadro de texto es donde se pone la
contrase&ntilde;a
-=======
- <p><span class="guilabel">Password</span>: This text box is where you actually put the
- password
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Contrase&ntilde;a (de nuevo)</span>: vuelva a escribir la contrase&ntilde;a
y Drakx comprobar&aacute; que coincide con la que se ha definido anteriormente.
-=======
- <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will
- check that it matches with the one set above.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Avanzado</span></p>
-=======
- <p><span class="guilabel">Advanced</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Habilitar ACPI:</span> ACPI (Advanced Configuration and Power
Interface) es un est&aacute;ndar para la administraci&oacute;n de energ&iacute;a. Se puede
ahorrar energ&iacute;a al detener los dispositivos no utilizados, este fue el
@@ -444,55 +306,30 @@
su equipo no admite ACPI o si cree que la implementaci&oacute;n de ACPI podr&iacute;a
causar algunos problemas (por ejemplo, reinicios aleatorios o bloqueos del
sistema).
-=======
- <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).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Habilitar SMP</span>: esta opci&oacute;n habilita / deshabilita el
multiprocesamiento sim&eacute;trico para procesadores multi-n&uacute;cleo.
-=======
- <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
- multiprocessing for multi core processors.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Habilitar APIC</span>: Activar o desactivar esta opci&oacute;n le
permite al sistema operativo acceder al Controlador de interrupci&oacute;n
programable avanzado. Los dispositivos APIC permiten modelos de prioridad
m&aacute;s complejos y la gesti&oacute;n avanzada de IRQ (Solicitud de interrupci&oacute;n).
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Habilitar APIC local</span>: Aqu&iacute; puede establecer APIC local,
que administra todas las interrupciones externas para un procesador
espec&iacute;fico en un sistema SMP.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -506,19 +343,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="P&aacute;gina siguiente">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e966"></a>P&aacute;gina siguiente
-=======
- <div class="section" title="Next page">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e969"></a>Next page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -530,70 +359,43 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Predeterminado:</span> Sistema operativo iniciado de forma
predeterminada
-=======
- <p><span class="guilabel">Default:</span> Operating system started up by default
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">A&ntilde;adir:</span> Esta opci&oacute;n le permite pasar la informaci&oacute;n del
kernel o decirle al n&uacute;cleo que le proporcione m&aacute;s informaci&oacute;n a medida que
arranca.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Detecci&oacute;n de otros sistemas operativos</span>: ver arriba
<a class="link" href="setupBootloader.html#setupMageiaBootloader"> Utilizar un gestor de arranque Mageia
</a></p>
-=======
- <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Avanzado</span></p>
-=======
- <p><span class="guilabel">Advanced</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Modo de video:</span> Define el tama&ntilde;o de la pantalla y la
profundidad de color que utilizar&aacute; el men&uacute; de arranque. Si hace clic en el
tri&aacute;ngulo hacia abajo, se le ofrecer&aacute;n otras opciones de tama&ntilde;o y
profundidad de color.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="bold"><strong>No toque ESP o MBR</strong></span>: ver arriba <a class="link" href="setupBootloader.html#setupChainLoading">Uso de la cadena de arranque</a></p>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
diff --git a/es/setupBootloaderAddEntry.html b/es/setupBootloaderAddEntry.html
index 2431cb2..c5b847d 100644
--- a/es/setupBootloaderAddEntry.html
+++ b/es/setupBootloaderAddEntry.html
@@ -27,13 +27,8 @@
-<<<<<<< HEAD
<p>Para ello, necesita editar manualmente /boot/grub2/custom.cfg o usar el
software grub-customizer (Disponible en los repositorios Mageia).
-=======
- <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).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -46,11 +41,7 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Para m&aacute;s informaci&oacute;n, vea nuestro 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>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/es/uninstall-Mageia.html b/es/uninstall-Mageia.html
index 33c5cc0..49a43f9 100644
--- a/es/uninstall-Mageia.html
+++ b/es/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1238"></a>Guias
-=======
- <h3 class="title"><a name="d5e1241"></a>Guias
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/et/Select-and-use-ISOs.html b/et/Select-and-use-ISOs.html
index b07d86d..97df409 100644
--- a/et/Select-and-use-ISOs.html
+++ b/et/Select-and-use-ISOs.html
@@ -41,10 +41,6 @@
</p>
<p>Andmekandjaid on kaht t&uuml;&uuml;pi:</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -493,11 +489,7 @@
leida allalaaditud faili p&otilde;hjal, saab tulemuseks kas sama arvu, mis
t&auml;hendab, et allalaaditud fail on korras, v&otilde;i siis m&otilde;ne muu arvu, mis
t&auml;hendab, et see ei ole korras. Viimasel juhul tuleks fail uuesti alla
-<<<<<<< HEAD
laadida v&otilde;i p&uuml;&uuml;da see BitTorrenti abil parandada.
-=======
- laadida.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Avage konsool (selleks ei pea olema administraator) ja kirjutage:</p>
@@ -597,11 +589,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Graafilise t&ouml;&ouml;riista kasutamine Mageias
-=======
- <h5 class="title"><a name="d5e183"></a>Graafilise t&ouml;&ouml;riista kasutamine Mageias
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -617,11 +605,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Graafilise t&ouml;&ouml;riista kasutamine Windowsis
-=======
- <h5 class="title"><a name="d5e187"></a>Graafilise t&ouml;&ouml;riista kasutamine Windowsis
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -643,11 +627,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>K&auml;surea kasutamine GNU/Linuxi s&uuml;steemis
-=======
- <h5 class="title"><a name="d5e194"></a>K&auml;surea kasutamine GNU/Linuxi s&uuml;steemis
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/et/addUser.html b/et/addUser.html
index 6954a32..e7e282f 100644
--- a/et/addUser.html
+++ b/et/addUser.html
@@ -139,24 +139,7 @@
lugemis- kui ka kirjutuskaitstud (umask=0027).
</p>
-<<<<<<< HEAD
<p>K&otilde;ik vajalikud kasutajad saab lisada juba paigaldamise ajal
-=======
- <p>Kui aga uue paigalduse j&auml;rel lisada kasutaja t&ouml;&ouml;riistaga <span class="emphasis"><em>Mageia
- juhtimiskeskus - S&uuml;steem - Kasutajate haldamine</em></span>, on nende
- kasutajate kodukataloog kaitstud nii kirjutamise kui ka lugemise eest.
- </p>
-
-
- <p>Kui te ei soovi, et kodukataloog oleks kellelegi n&auml;ha ehk loetav, on
- soovitatav praegu lisada ainult ajutine kasutaja ja tegelikud kasutajad
- alles p&auml;rast taask&auml;ivitamist.
- </p>
-
-
- <p>Kui aga teil pole midagi selle vastu, et kodukataloogid on k&otilde;igile n&auml;ha,
- v&otilde;ite lisada k&otilde;ik vajalikud kasutajad juba paigaldamise ajal
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<span class="emphasis"><em>kokkuv&otilde;tte</em></span> etapil. Valige seal <span class="emphasis"><em>Kasutajate
haldamine</em></span>.
</p>
@@ -186,10 +169,6 @@
</p>
<p> Samuti saab siin lubada v&otilde;i keelata k&uuml;laliskonto.</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="warning" title="Hoiatus" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
diff --git a/et/index.html b/et/index.html
index 984548c..7875724 100644
--- a/et/index.html
+++ b/et/index.html
@@ -75,7 +75,6 @@
<dt><span class="section"><a href="setupBootloader.html">Alglaaduri p&otilde;hiseadistused</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e904">Alglaaduri liides</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e932">Mageia alglaaduri kasutamine</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e948">Olemasoleva alglaaduri kasutamine</a></span></dt>
@@ -84,19 +83,6 @@
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismen&uuml;&uuml; kirje lisamine v&otilde;i muutmine</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e910">BIOS-e s&uuml;steemiga</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e947">UEFI s&uuml;steemiga</a></span></dt>
- </dl>
- </dd>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html">Alglaadimismen&uuml;&uuml; kirje lisamine v&otilde;i muutmine</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e962">BIOS-e s&uuml;steemiga</a></span></dt>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e979">UEFI s&uuml;steemiga</a></span></dt>
- </dl>
- </dd>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<dt><span class="section"><a href="misc-params.html">Seadistuste kokkuv&otilde;te</a></span></dt>
<dd>
<dl>
diff --git a/et/setupBootloader.html b/et/setupBootloader.html
index 93673fa..1b5ee32 100644
--- a/et/setupBootloader.html
+++ b/et/setupBootloader.html
@@ -29,21 +29,11 @@
-<<<<<<< HEAD
<div class="section" title="Alglaaduri liides">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e904"></a>Alglaaduri liides
-=======
-
-
- <div class="section" title="BIOS-e s&uuml;steemiga">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e910"></a>BIOS-e s&uuml;steemiga
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -101,46 +91,11 @@
-<<<<<<< HEAD
-=======
- <p><a name="setupBootloader-pa4"></a>Vaikimisi kirjutab Mageia uue GRUBi alglaaduri teie esimese k&otilde;vaketta MBR
- (Master Boot Record) sektsiooni. Kui teil on juba paigaldatud teisi
- operatsioonis&uuml;steeme, &uuml;ritab Mageia lisada need uude Mageia
- alglaadimismen&uuml;&uuml;sse.
- </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&Auml;rge muutke "Alglaadimisseadet", kui te pole t&auml;iesti kindel, et teate, mida
teete.
</p>
-<<<<<<< HEAD
-=======
-
-
- <div class="warning" title="Hoiatus" 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="[Hoiatus]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><a name="setupBootloader-pa6"></a>Linuxi s&uuml;steeme, mis kasutavad GRUB2 alglaadurit, vanem GRUB praegu ei toeta
- ega tunne neid &auml;ra, kui kasutada vaikimisi GRUBi alglaadurit.
- </p>
-
-
- <p>Sel juhul on parim lahendus kasutada GRUB2 alglaadurit, mille saab valida
- paigaldamise ajal kokkuv&otilde;ttelehek&uuml;ljel.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -162,13 +117,6 @@
</p>
-<<<<<<< HEAD
-=======
- <p><a name="setupBootloader-pa47"></a>&Auml;rge valige seadet, nt "sda", sest nii kirjutate &uuml;le olemasoleva MBR
- sektsiooni. Peate valima juurpartitsiooni, mille valisite varasemal
- partitsioneerimisetapil, nt sda7.
- </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Kui Mageia on ainuke s&uuml;steem, mis on teie arvutisse paigaldatud, loob
@@ -255,19 +203,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Ahellaadimise kasutamine">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e951"></a>Ahellaadimise kasutamine
-=======
- <div class="section" title="UEFI s&uuml;steemiga">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e947"></a>UEFI s&uuml;steemiga
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -275,21 +215,15 @@
-<<<<<<< HEAD
<p>Kui Te ei soovi alglaaditavat Mageiat, vaid tahate seda laadida m&otilde;nest
teisest operatsioonis&uuml;steemist, siis kl&otilde;psake
<span class="guibutton">J&auml;rgmine</span>, seej&auml;rel <span class="guibutton">Muu</span> ja
m&auml;rkige &auml;ra kastike <span class="guilabel">ESP-i ega MBR-i ei puudutata</span>.
-=======
- <p>UEFI s&uuml;steemi korral on kasutajaliides pisut teistsugune, sest te ei saa
- valida alglaadurit, kuna saadaval on ainult Grub2-efi.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>N&auml;ete hoiatust, et alglaadur puudub. Eirake seda ja kl&otilde;psake
<span class="guibutton">Olgu</span>.
</p>
@@ -471,21 +405,6 @@
</div>
</div>
-=======
- <p>Kui Mageia on esimene s&uuml;steem, mis teie arvutisse paigaldatakse, loob
- paigaldusprogramm ESP (EFI s&uuml;steemse partitsiooni) alglaaduri (Grub2-efi)
- tarbeks. Kui arvutisse on juba paigaldatud UEFI operatsioonis&uuml;steeme
- (n&auml;iteks Windows 8), tuvastab Mageia paigaldusprogramm Windowsi loodud ESP
- ja lisab sellele Grub2-efi. ESP-sid v&otilde;ib k&uuml;ll p&otilde;him&otilde;tteliselt olla ka mitu,
- aga v&auml;ga soovitatav on siiski kasutada ainult &uuml;ht s&otilde;ltumata sellest, kui
- palju on arvutis operatsioonis&uuml;steeme.
- </p>
-
-
- <p>&Auml;rge muutke "Alglaadimisseadet", kui te pole t&auml;iesti kindel, et teate, mida
- teete.
- </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
diff --git a/et/setupBootloaderAddEntry.html b/et/setupBootloaderAddEntry.html
index 1a9a069..2318aeb 100644
--- a/et/setupBootloaderAddEntry.html
+++ b/et/setupBootloaderAddEntry.html
@@ -32,7 +32,6 @@
</p>
-<<<<<<< HEAD
<div class="note" title="M&auml;rkus" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -47,110 +46,6 @@
</td>
</tr>
</table>
-=======
- <div class="section" title="BIOS-e s&uuml;steemiga">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e962"></a>BIOS-e s&uuml;steemiga
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Kirje saab lisada v&otilde;i valitut muuta, kui kl&otilde;psata <span class="emphasis"><em>alglaaduri
- seadistamise</em></span> ekraanil vajalikule nupule ja sooritada muutused
- selle kohale ilmuvas ekraanis.
- </p>
-
-
- <div class="note" title="M&auml;rkus" 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="[M&auml;rkus]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Kui olete valinud alglaaduriks <code class="code">Grub 2</code>, ei saa te selle
- t&ouml;&ouml;riistaga sel sammul kirjeid muuta, nii et kl&otilde;psake 'Edasi'. Teil tuleb
- k&auml;sitsi muuta faili <code class="code">/boot/grub2/custom.cfg</code> v&otilde;i kasutada
- t&ouml;&ouml;riista <code class="code">grub-customizer</code>.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
-
- <p>M&otilde;ningaid asju v&otilde;ib muuta v&auml;hese riskiga, n&auml;iteks kirje nimi ja m&auml;rge
- kastikeses, millega see muudetakse vaikimisi kirjeks.
- </p>
-
-
- <p>Kirje nimele v&otilde;ib lisada versiooninumbri, aga nime v&otilde;ib ka t&auml;ielikult muuta.</p>
-
-
- <p>Vaikimisi kirje on see, mille s&uuml;steem laadib, kui j&auml;tate alglaadimise ajal
- kasutamata v&otilde;imaluse midagi valida.
- </p>
-
-
- <div class="warning" title="Hoiatus" 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="[Hoiatus]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Teiste parameetrite muutmine v&otilde;ib kaasa tuua s&uuml;steemi, mida enam ei saagi
- laadida. Sestap &auml;rge muutke siin midagi, mille muutmise vajalikkuses te
- t&auml;iesti kindel ei ole.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </div>
-
-
- <div class="section" title="UEFI s&uuml;steemiga">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e979"></a>UEFI s&uuml;steemiga
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Sel juhul on alglaaduriks valitud Grub2-efi ning te ei saa selle t&ouml;&ouml;riistaga
- sel sammul kirjeid muuta. Teil tuleb k&auml;sitsi muuta faili
- <code class="code">/boot/grub2/custom.cfg</code> v&otilde;i kasutada t&ouml;&ouml;riista
- <code class="code">grub-customizer</code>. Ainuke asi, mida siin teha saab, on valida
- rippmen&uuml;&uuml;st vaikimisi kirje.
- </p>
-
-
- <p>Kl&otilde;psu j&auml;rel nupule <span class="guibutton">Edasi</span> laseb j&auml;rgmine rippmen&uuml;&uuml;
- valida Grub2 ekraanilahutuse (kuna see on graafiline alglaadur).
- </p>
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</div>
diff --git a/eu/Select-and-use-ISOs.html b/eu/Select-and-use-ISOs.html
index 3dfc46d..d1f84be 100644
--- a/eu/Select-and-use-ISOs.html
+++ b/eu/Select-and-use-ISOs.html
@@ -464,15 +464,9 @@
</p>
-<<<<<<< HEAD
<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 a window similar to this one appears:
-=======
- <p>md5sum eta sha1sum ISOaren osotasuna egiaztatzeko tresnak dira. Erabili
- horietako bat bakarrik. Gorde bat <a class="link" href="Select-and-use-ISOs.html#integrity">geroago
- erabiltzeko</a>. Ondoren leiho hau agertuko da:
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -491,21 +485,12 @@
</div>
-<<<<<<< HEAD
<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
failure. A failure infers that you should retry the download or attempt a
repair using BitTorrent.
-=======
- <p>Checksum zenbaki biak deskargaturiko fitxategitik algoritmo batek
- kalkulatzen hamaseitarrak dira. Algoritmo hauei eskatzen diezunean zenbaki
- hau deskargatutako zure fitxategitik birkalkulatzeko, zenbaki bera duzu eta
- deskargatutako zure fitxategia zuzena da, edo zenbakia desberdina da eta
- porrota duzu. Porrot batek deskarga birprobatu behar izango zenukeela
- ondorioztatzen du.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Ireki kontsola bat, ez da root izan beharrik, eta:</p>
@@ -703,10 +688,6 @@
amaieran, gailuaren izena <span class="emphasis"><em>sd</em></span> hasita ikusiko duzu, eta
<span class="emphasis"><em>sdd</em></span> honetan kasu:
</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<pre class="screen">[72594.604531] usb 1-1-a: 27 zenbakia xhci_hcd erabiliz abiadura handiko USB-tresna berria
[72594.770528] usb 1-1-a: Aurkitutako USB-tresna berria, idVendor=8564, idProduktua=1000
[72594.770533] usb 1-1-a: USB-etako tresnako kate berriak: Mfr=1, Product=2, SerieZenbakia=3
diff --git a/eu/addUser.html b/eu/addUser.html
index 3722fb9..ec037f3 100644
--- a/eu/addUser.html
+++ b/eu/addUser.html
@@ -144,23 +144,6 @@
Summary</em></span> step during the install. Choose <span class="emphasis"><em>User
management</em></span>.
</p>
-<<<<<<< HEAD
-=======
-
-
- <p>Ez baduzu nahi home direktorioa edonork irakurgarri izan dezan, aldi
- baterako erabiltzaile bat soilik gehitu orain eta berrabiarazi ondoren
- benetako(ak) gehitzea komeni da.
- </p>
-
-
- <p>Mundu guztiak irakur ditzakeen direktorioak nahigao badituzu, instalazioan
- zehar <span class="emphasis"><em>Ezarpen - Laburpen</em></span> beharrezko erabiltzaile
- guztiak gehi ditzakezu. Aukeratu <span class="emphasis"><em>Erabiltzaileak
- kudeatu</em></span>.
- </p>
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Sarbide baimena instalatu ondoren ere aldatu egin daiteke.</p>
@@ -188,10 +171,6 @@
</p>
<p>Gainera, baliogabetu edo gaitu ahal izango duzu gonbidatu kontu bat.</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="warning" title="Abisua" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
diff --git a/eu/index.html b/eu/index.html
index 2640a79..69bb5c7 100644
--- a/eu/index.html
+++ b/eu/index.html
@@ -75,8 +75,7 @@
<dt><span class="section"><a href="setupBootloader.html">Abio kargatzailearen aukera nagusiak</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
- <dt><span class="section"><a href="setupBootloader.html#d5e901">Bootloader interface</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e901">Abioko kargatzailearen interfazea</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e929">Mageia abio kargatzailea erabiliz</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e945">Existitzen den abio kargatzaile bat erabiliz</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e948">Using chain loading</a></span></dt>
@@ -84,19 +83,6 @@
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Gegitu edo Aldatu Abio Menuko Sarrera</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e909">Bios sistemarekin</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e946">UEFI sistemarekin</a></span></dt>
- </dl>
- </dd>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html">Gegitu edo Aldatu Abio Menuko Sarrera</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e965">Bios sistemarekin</a></span></dt>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e982">UEFI sistemarekin</a></span></dt>
- </dl>
- </dd>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<dt><span class="section"><a href="misc-params.html">Hainbat parametroen laburpena</a></span></dt>
<dd>
<dl>
@@ -127,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Mageia desinstalatzen</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1271">Jarraibideak</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1221">Jarraibideak</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/eu/setupBootloader.html b/eu/setupBootloader.html
index decf724..d52b09c 100644
--- a/eu/setupBootloader.html
+++ b/eu/setupBootloader.html
@@ -29,21 +29,11 @@
-<<<<<<< HEAD
- <div class="section" title="Bootloader interface">
+ <div class="section" title="Abioko kargatzailearen interfazea">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e901"></a>Bootloader interface
-=======
-
-
- <div class="section" title="Bios sistemarekin">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e909"></a>Bios sistemarekin
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
+ <h3 class="title"><a name="d5e901"></a>Abioko kargatzailearen interfazea
</h3>
</div>
</div>
@@ -63,7 +53,7 @@
</li>
<li class="listitem">
- <p>Grub2-efi for a UEFI system.</p>
+ <p>Grub2-efi UEFI sistementzat.</p>
</li>
</ul>
@@ -79,7 +69,7 @@
<tr>
<td align="left" valign="top">
- <p>The mageia grafiko menu politak ditu:</p>
+ <p>The mageia menuak grafikoa politak ditu :)</p>
</td>
</tr>
@@ -99,55 +89,18 @@
-<<<<<<< HEAD
<p>Ez aldatu "Abio Gailua" zer egiten duzun benetan jakin gabe.</p>
-=======
- <p><a name="setupBootloader-pa4"></a>Berez, Mageia GRUB (Ondare) kargatzaile berria zure disko gogorreko MBR
- (Master Boot Record)-an idazten du lehenengoz. Sistema eragile bat baino
- gehiago baduzu, Mageia saiatuko da abio menu berrira gehitzen.
- </p>
-
-
- <p>Mageia gaur egun GRUB2 eskaintzen du GRUB ondarea eta Lilo gain aukerako
- abioko kargatzailea gisa.
- </p>
-
-
- <div class="warning" title="Abisua" 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="[Abisua]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><a name="setupBootloader-pa6"></a>Linux sistemek Grub2 abioko kargatzailea erabiltzerakoan ez daude onartuta
- GRUB (ondarea)gaitik eta ez du aitortzen lehenetsitako GRUB kargatzailea
- erabiltzen badu.
- </p>
-
-
- <p>Instalazioan orrialdean zehar laburpena eskuragarri duen GRUB2 abio
- kargatzailea hemen erabiltzea da konponbiderik onena.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
- <div class="section" title="Grub2-efi on UEFI systems">
+ <div class="section" title="Grub2-efi UEFI sistemetan">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e919"></a>Grub2-efi on UEFI systems
+ <h4 class="title"><a name="d5e919"></a>Grub2-efi UEFI sistemetan
</h4>
</div>
</div>
@@ -160,13 +113,6 @@
</p>
-<<<<<<< HEAD
-=======
- <p><a name="setupBootloader-pa47"></a>Ez ezazu aukeratu "sda" bezalako gailu bat, edo MBR existentea gainidatziko
- du. Partizio fasean zehar aukeratutako root partizioa aukeratu behar duzu,
- adibidez sda7 bezala.
- </p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>If Mageia is the only system installed on your computer, the installer
@@ -250,19 +196,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e948"></a>Using chain loading
-=======
- <div class="section" title="UEFI sistemarekin">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e946"></a>UEFI sistemarekin
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -270,21 +208,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>UEFI sistema batekin, erabiltzaile interfazearen zertxobait ezberdinak dira,
- ezin duzu abiarazlea aukeratu Grub2-efi soilik dagoelako eskuragarri
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>You will get a warning that the bootloader is missing, ignore it by clicking
<span class="guibutton">OK</span>.
</p>
@@ -306,11 +238,11 @@
- <div class="section" title="First page">
+ <div class="section" title="Lehen orria">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e966"></a>First page
+ <h4 class="title"><a name="d5e966"></a>Lehen orria
</h4>
</div>
</div>
@@ -331,8 +263,9 @@
<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.
+ bootloader. This means a username and password will be asked at the boot
+ time to select a booting entry or change settings. The username is "root"
+ and the password is the one chosen here after.
</p>
</li>
@@ -352,7 +285,7 @@
</li>
<li class="listitem">
- <p><span class="guilabel">Advanced</span></p>
+ <p><span class="guilabel">Aurreratu</span></p>
<div class="itemizedlist">
@@ -435,7 +368,7 @@
</li>
<li class="listitem">
- <p><span class="guilabel">Advanced</span></p>
+ <p><span class="guilabel">Aurreratu</span></p>
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
@@ -459,19 +392,6 @@
</div>
</div>
-=======
- <p>Mageia zure ordenagailuan instalatutako lehen sistema bada, instalatzaileai
- ESP (EFI sistema partizioa) sortuko du (Grub2-EFI) kargatzaileak
- jasotzeko. Zure ordenagailuan UEFI sistema eragile bat bazegoen aldez
- aurretik (Windows 8 adibidez), Mageia instalatzaileak detektatuko ditu
- dauden Windows sortutako ESP eta grub2-EFI-ra gehituko ditu. Hainbat ESP
- izatea posiblea izan arren, soilik bat izatea aholkatzen da eta aski dituzun
- sistema eragileetako kopurua edozein izanik ere.
- </p>
-
-
- <p>Ez aldatu "Abio Gailua" zer egiten duzun benetan jakin gabe.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
diff --git a/eu/setupBootloaderAddEntry.html b/eu/setupBootloaderAddEntry.html
index adf28da..e24fad0 100644
--- a/eu/setupBootloaderAddEntry.html
+++ b/eu/setupBootloaderAddEntry.html
@@ -32,7 +32,6 @@
</p>
-<<<<<<< HEAD
<div class="note" title="Oharra" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -47,110 +46,6 @@
</td>
</tr>
</table>
-=======
- <div class="section" title="Bios sistemarekin">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e965"></a>Bios sistemarekin
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Sarrera lehen aukera gehitu edo alda dezakezu, beharrezko botoia sakatuz
- <span class="emphasis"><em>Abioko Ezarpen</em></span>etan eta goian agertzen den leihoan
- aukerak aldatzen.
- </p>
-
-
- <div class="note" title="Oharra" 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="[Oharra]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><code class="code">Grub 2</code> zure abioko kargatzaile bezala aukeratu baduzu, tresna
- hau ezin duzu erabili sarrerak aldatzeko urrats honetan, sakatu
- 'Hurrengoa'. <code class="code">/boot/grub2/custom.cfg</code> eskuz editatu edo ordez
- <code class="code">grub-customizer</code> erabili behar duzu.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
-
- <p>Segurtasunez egin daitezkeen gauza batzuk sarrera bati etiketa aldatzea eta
- lehenetsi gisa markatzea.
- </p>
-
-
- <p>Bertsio zenbaki egokia, edo izenez erabat sarrerari gehitu diezaiokezu.</p>
-
-
- <p>Lehenetsitako sarrera da sistemak zuk abioan zehar ez baduzu aukera egiten
- kargatzen duena.
- </p>
-
-
- <div class="warning" title="Abisua" 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="[Abisua]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Beste gauza batzuk aldatzeak zure sistema ez abiaraztea egin dezake. Mesedez
- ez egin ezer ere ez, zertan ari zaren jakin gabe.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </div>
-
-
- <div class="section" title="UEFI sistemarekin">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e982"></a>UEFI sistemarekin
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Kasu honetan Grub2-EFI erabiltzen ari zara, eta ezin duzu tresna hau erabili
- sarrerak aldatu egiteko urrats honetan. Horretarako eskuz editatu
- <code class="code">/boot/grub2/custom.cfg</code> edo erabili <code class="code">grub-customizer</code>
- ordez. Hemen egin dezakezun guztia, goitibeherako zerrendako sarrera
- lehenetsia aukeratzea da.
- </p>
-
-
- <p> <span class="guibutton">Hurrengoa</span> botoia klikatu ondoren, beste
- goitibeherako zerrendan bideoaren bereizmena hautatzea uzten du
- Grub2-rentzat zein abio kudeatzaike grafiko bat da.
- </p>
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</div>
diff --git a/eu/uninstall-Mageia.html b/eu/uninstall-Mageia.html
index 58f294d..3377050 100644
--- a/eu/uninstall-Mageia.html
+++ b/eu/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1271"></a>Jarraibideak
-=======
- <h3 class="title"><a name="d5e1221"></a>Jarraibideak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/fr/index.html b/fr/index.html
index 3391861..c4306b3 100644
--- a/fr/index.html
+++ b/fr/index.html
@@ -75,7 +75,6 @@
<dt><span class="section"><a href="setupBootloader.html">Principales options du chargeur de d&eacute;marrage</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e911">Interface du programme d'amor&ccedil;age</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e939">Utiliser un chargeur de d&eacute;marrage Mageia</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e955">Utiliser un chargeur de d&eacute;marrage existant. </a></span></dt>
@@ -84,19 +83,6 @@
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entr&eacute;e de Menu de D&eacute;marrage</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e918">Avec un syst&egrave;me BIOS</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e955">Avec un syst&egrave;me UEFI</a></span></dt>
- </dl>
- </dd>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html">Ajouter ou Modifier une Entr&eacute;e de Menu de D&eacute;marrage</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e974">Avec un syst&egrave;me BIOS</a></span></dt>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e991">Avec un syst&egrave;me UEFI</a></span></dt>
- </dl>
- </dd>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<dt><span class="section"><a href="misc-params.html">R&eacute;sum&eacute; des diff&eacute;rents param&egrave;tres</a></span></dt>
<dd>
<dl>
@@ -127,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">D&eacute;sinstaller Mageia</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1281">Guide</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1230">Guide</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/fr/setupBootloader.html b/fr/setupBootloader.html
index 152cb26..5b7b48d 100644
--- a/fr/setupBootloader.html
+++ b/fr/setupBootloader.html
@@ -33,11 +33,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e911"></a>Interface du programme d'amor&ccedil;age
-=======
- <h3 class="title"><a name="d5e918"></a>Avec un syst&egrave;me BIOS
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -211,11 +207,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e958"></a>Utilisation du chargement en cha&icirc;ne
-=======
- <h3 class="title"><a name="d5e955"></a>Avec un syst&egrave;me UEFI
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/fr/setupBootloaderAddEntry.html b/fr/setupBootloaderAddEntry.html
index 0b2001f..ffe3ef2 100644
--- a/fr/setupBootloaderAddEntry.html
+++ b/fr/setupBootloaderAddEntry.html
@@ -32,7 +32,6 @@
</p>
-<<<<<<< HEAD
<div class="note" title="Note" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -47,116 +46,6 @@
</td>
</tr>
</table>
-=======
- <div class="section" title="Avec un syst&egrave;me BIOS">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e974"></a>Avec un syst&egrave;me BIOS
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Vous pouvez ajouter une entr&eacute;e ou en modifier une apr&egrave;s l'avoir
- s&eacute;lectionn&eacute;e, en pressant le bouton correspondant dans l'&eacute;cran de
- <span class="emphasis"><em>Configuration du d&eacute;marrage</em></span> et en &eacute;ditant les entr&eacute;es de
- la fen&ecirc;tre qui s'ouvre &agrave; ce moment.
- </p>
-
-
- <div class="note" title="Note" 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="[Note]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Si vous avez choisi <code class="code">Grub 2</code> comme chargeur de d&eacute;marrage, vous ne
- pouvez pas utliser cet outil pour modifier les entr&eacute;es &agrave; cette &eacute;tape,
- appuyez sur 'Suivant'. Vous devez modifier manuellement le fichier
- <code class="code">/boot/grub2/custom.cfg</code> ou utiliser <code class="code">grub-customizer</code>
- &agrave; la place.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
-
- <p>Le changement du nom d'une entr&eacute;e et l'activation de la case &agrave; cocher pour
- d&eacute;finir l'entr&eacute;e par d&eacute;faut sont des actions qui ne comportent pas de
- risques.
- </p>
-
-
- <p>Vous pouvez ajouter votre propre version du num&eacute;ro d'une entr&eacute;e ou la
- renommer compl&egrave;tement.
- </p>
-
-
- <p>L'entr&eacute;e par d&eacute;faut est celle qui est choisie lorsque aucun choix n'est fait
- pendant la phase de d&eacute;marrage du syst&egrave;me.
- </p>
-
-
- <div class="warning" title="Avertissement" 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="[Avertissement]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Modifier d'autres choses peut vous laisser avec un syst&egrave;me
- non-d&eacute;marrable. N'essayez pas quoi que ce soit sans savoir ce que vous
- faites.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </div>
-
-
- <div class="section" title="Avec un syst&egrave;me UEFI">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e991"></a>Avec un syst&egrave;me UEFI
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Dans ce cas, vous utilisez Grub2-efi et vous ne pouvez pas utiliser cet
- outil pour modifier les entr&eacute;es &agrave; cette &eacute;tape. Pour faire cela, vous devez
- modifier manuellement <code class="code">/boot/grub2/custom.cfg</code> ou utiliser
- <code class="code">grub-customizer</code> &agrave; la place. Tout ce que vous pouvez faire ici,
- c'est choisir l'entr&eacute;e par d&eacute;faut dans la liste d&eacute;roulante.
- </p>
-
-
- <p>Apr&egrave;s avoir cliqu&eacute; sur le bouton <span class="guibutton">Suivant</span>, une autre
- liste d&eacute;roulante permet de choisir la r&eacute;solution vid&eacute;o pour Grub2, qui est
- le chargeur de d&eacute;marrage graphique.
- </p>
-
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</div>
diff --git a/fr/uninstall-Mageia.html b/fr/uninstall-Mageia.html
index 62f2f37..21a3879 100644
--- a/fr/uninstall-Mageia.html
+++ b/fr/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1281"></a>Guide
-=======
- <h3 class="title"><a name="d5e1230"></a>Guide
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
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>
diff --git a/nl/Select-and-use-ISOs.html b/nl/Select-and-use-ISOs.html
index 491e132..c41334b 100644
--- a/nl/Select-and-use-ISOs.html
+++ b/nl/Select-and-use-ISOs.html
@@ -139,27 +139,6 @@
</p>
</li>
-<<<<<<< HEAD
-=======
- </ul>
- </div>
-
- </div>
-
- <div class="section" title="dvd">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>dvd
- </h5>
- </div>
- </div>
- </div>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>Vershillende media voor 32- en 64-bits architectuur.</p>
@@ -195,11 +174,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>Live media
-=======
- <h4 class="title"><a name="d5e56"></a>Live media
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -210,11 +185,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>Algemene eigenschappen
-=======
- <h5 class="title"><a name="d5e58"></a>Algemene eigenschappen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -232,11 +203,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Elke ISO bevat slechts &eacute;&eacute;n werkomgeving (Plasma, GNOME of Xfce).</p>
-=======
- <p>Elke ISO bevat slechts &eacute;&eacute;n werkomgeving (KDE, GNOME of Xfce).</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -265,11 +232,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>PLASMA Live DVD
-=======
- <h5 class="title"><a name="d5e72"></a>PLASMA Live DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -290,11 +253,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Alleen 64-bits architectuur.</p>
-=======
- <p>Vershillende media voor 32- en 64-bits architectuur.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -306,11 +265,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>GNOME Live DVD
-=======
- <h5 class="title"><a name="d5e81"></a>GNOME Live DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -343,11 +298,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>Xfce Live DVD
-=======
- <h5 class="title"><a name="d5e90"></a>Xfce Live DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -382,11 +333,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>Enkel-opstart CD-media
-=======
- <h4 class="title"><a name="d5e99"></a>Enkel-opstart CD-media
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -397,11 +344,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>Algemene eigenschappen
-=======
- <h5 class="title"><a name="d5e101"></a>Algemene eigenschappen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -447,11 +390,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -476,11 +415,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -509,11 +444,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>Een medium downloaden en checken
-=======
- <h3 class="title"><a name="d5e122"></a>Een medium downloaden en checken
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -524,11 +455,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>Downloaden
-=======
- <h4 class="title"><a name="d5e124"></a>Downloaden
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -543,13 +470,8 @@
<p>md5sum en sha1sum zijn hulpmiddelen om de integriteit van de ISO te
-<<<<<<< HEAD
controleren. Gebruik er maar &eacute;&eacute;n van. Bewaar &eacute;&eacute;n van hen <a class="link" href="Select-and-use-ISOs.html#integrity">voor verder gebruik</a>. Er verschijnt dan een
venster dat lijkt op deze:
-=======
- controleren. Gebruik er maar &eacute;&eacute;n van. Bewaar &eacute;&eacute;n van hen <a class="link" href="Select-and-use-ISOs.html#integrity">voor verder gebruik</a>. Dan verschijnt er dit
- venster:
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -561,31 +483,18 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>De integriteit van het gedownloade medium controleren
-=======
- <h4 class="title"><a name="d5e136"></a>De integriteit van het gedownloade ISO controleren
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
</div>
-<<<<<<< HEAD
<p>Beide checksums zijn hexadecimale getallen die door een algoritme voor het
te downloaden bestand berekend zijn. Als u deze checksums opnieuw laat
berekenen voor het gedownloade bestand en de uitkomst is gelijk, dan is het
bestand in orde. Als de uitkomst niet overeenkomt, kunt u de download beter
overdoen of een reparatie proberen met behulp van BitTorrent. .
-=======
- <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
- failure. A failure infers that you should retry the download or attempt a
- repair using BitTorrent.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Open een terminal (niet als root), en:</p>
@@ -613,11 +522,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>Brand of dump het ISO
-=======
- <h3 class="title"><a name="d5e149"></a>Brand of dump het ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -633,11 +538,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>De ISO op een CD/DVD branden
-=======
- <h4 class="title"><a name="d5e152"></a>De ISO op een CD/DVD branden
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -656,11 +557,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>Dump de ISO op een USB-stick
-=======
- <h4 class="title"><a name="d5e157"></a>Dump de ISO op een USB-stick
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -698,11 +595,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Gebruik een grafisch hulpmiddel binnen Mageia
-=======
- <h5 class="title"><a name="d5e163"></a>Gebruik een grafisch hulpmiddel binnen Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -717,11 +610,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Gebruik een grafisch hulpmiddel binnen Windows
-=======
- <h5 class="title"><a name="d5e167"></a>Gebruik een grafisch hulpmiddel binnen Windows
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -743,11 +632,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>Gebruik de commandoregel binnen een GNU/Linux-systeem
-=======
- <h5 class="title"><a name="d5e174"></a>Gebruik de commandoregel binnen een GNU/Linux-systeem
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/nl/index.html b/nl/index.html
index 4488cff..8c73f7e 100644
--- a/nl/index.html
+++ b/nl/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introductie</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#d5e119">Een medium downloaden en checken</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Brand of dump het ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Een medium downloaden en checken</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">Brand of dump het ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, het Mageia-installatieprogramma</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Algemene opties voor de opstartlader</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e882">Opstartlader Interface</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e906">De Mageia-opstartlader gebruiken</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e920">Een bestaande opstartlader gebruiken</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e923">Met behulp van opeenvolgend laden</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e937">Opties</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e885">Opstartlader Interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e909">De Mageia-opstartlader gebruiken</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e923">Een bestaande opstartlader gebruiken</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e926">Met behulp van opeenvolgend laden</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e940">Opties</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Wijzig een opstartmenu-ingang of voeg er een toe</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Mageia de&iuml;nstalleren</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Howto</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1246">Howto</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/nl/setupBootloader.html b/nl/setupBootloader.html
index d2ac750..a38f84c 100644
--- a/nl/setupBootloader.html
+++ b/nl/setupBootloader.html
@@ -33,11 +33,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e882"></a>Opstartlader Interface
-=======
- <h3 class="title"><a name="d5e885"></a>Opstartlader Interface
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -75,11 +71,7 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>De Mageia grafische menu's zijn mooi :)</p>
-=======
- <p>De Mageia grafische menu's zijn mooi :</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
@@ -91,11 +83,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e892"></a>Grub2 op Legacy/MBR en Legacy/GPT systemen
-=======
- <h4 class="title"><a name="d5e895"></a>Grub2 op Legacy/MBR en Legacy/GPT systemen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -114,11 +102,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e898"></a>Grub2-efi op UEFI systemen
-=======
- <h4 class="title"><a name="d5e901"></a>Grub2-efi op UEFI systemen
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -133,7 +117,6 @@
-<<<<<<< HEAD
<p>Als uw computer naast Mageia geen ander besturingssysteem had, dan heeft het
Mageia-installatieprogramma een ESP (EFI-SysteemPartitie) voor de
opstartlader (Grub2-efi) gemaakt. Stond er echter al eerder een
@@ -142,15 +125,6 @@
grub2-efi-opstartlader daaraan toevoegd. Alhoewel het mogelijk is
verscheidene ESP's te hebben, wordt aanbevolen het bij &eacute;&eacute;n te laten. &Eacute;&eacute;n is
genoeg, ongeacht het aantal besturingssystemen dat u heeft.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -165,11 +139,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e906"></a>De Mageia-opstartlader gebruiken
-=======
- <h3 class="title"><a name="d5e909"></a>De Mageia-opstartlader gebruiken
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -212,11 +182,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e920"></a>Een bestaande opstartlader gebruiken
-=======
- <h3 class="title"><a name="d5e923"></a>Een bestaande opstartlader gebruiken
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -238,11 +204,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e923"></a>Met behulp van opeenvolgend laden
-=======
- <h3 class="title"><a name="d5e926"></a>Met behulp van opeenvolgend laden
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -272,11 +234,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e937"></a>Opties
-=======
- <h3 class="title"><a name="d5e940"></a>Opties
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -288,11 +246,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e939"></a>Eerste pagina
-=======
- <h4 class="title"><a name="d5e942"></a>Eerste pagina
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -312,18 +266,11 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Beveiliging</span>: Hiermee kunt u een wachtwoord instellen
voor de opstartlader. Dit betekent dat een gebruikersnaam en wachtwoord
tijdens de opstarttijd zal worden gevraagd waarna u een opstartinvoer kunt
selecteren of instellingen kan wijzigen. De gebruikersnaam is 'root' en
hierna wordt het wachtwoord gekozen.
-=======
- <p><span class="guilabel">Veiligheid</span>: Hiermee kunt u een wachtwoord voor de
- opstartlader instellen. Dit betekent dat andere mensen niet de enkele
- gebruiker modus kunnen gebruiken. Daarnaast kunnen zij ook geen instellingen
- wijzigen tijdens het opstarten.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -351,7 +298,6 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">ACPI Inschakelen:</span> ACPI (Advanced Configuration and
Power Interface) is een standaard voor energiebeheer. Het kan energie
besparen door ongebruikte apparaten uit te schakelen. Dit was de methode die
@@ -359,14 +305,6 @@
bijvoorbeeld als uw computer niet ACPI ondersteunt of als u denkt dat de
ACPI-implementatie kan leiden tot een aantal problemen (bijvoorbeeld dat het
systeem willekeurige opnieuw opstart of vastloopt).
-=======
- <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).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -409,11 +347,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e971"></a>Volgende pagina
-=======
- <h4 class="title"><a name="d5e974"></a>Volgende pagina
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
diff --git a/nl/uninstall-Mageia.html b/nl/uninstall-Mageia.html
index b92a679..20f0b47 100644
--- a/nl/uninstall-Mageia.html
+++ b/nl/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1243"></a>Howto
-=======
- <h3 class="title"><a name="d5e1246"></a>Howto
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/ro/Select-and-use-ISOs.html b/ro/Select-and-use-ISOs.html
index c37237e..b30889f 100644
--- a/ro/Select-and-use-ISOs.html
+++ b/ro/Select-and-use-ISOs.html
@@ -23,9 +23,7 @@
</div>
</div>
-
-
<div class="section" title="Introducere">
<div class="titlepage">
@@ -37,15 +35,12 @@
</div>
</div>
-
<p>Mageia este distribuit&#259; prin imagini ISO. Aceast&#259; pagin&#259; v&#259; va ajuta s&#259;
alege&#539;i imaginea care se potrive&#537;te nevoilor voastre.
</p>
-
<p>Exist&#259; dou&#259; familii de medii:</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -71,12 +66,10 @@
</li>
</ul>
</div>
-
<p>Detaliile s&icirc;nt oferite &icirc;n sec&#539;iunile urm&#259;toare.</p>
</div>
-
<div class="section" title="Medii">
<div class="titlepage">
@@ -88,7 +81,6 @@
</div>
</div>
-
<div class="section" title="Defini&#539;ie">
<div class="titlepage">
@@ -100,19 +92,16 @@
</div>
</div>
-
<p>Aici, un mediu (plural: medii) este o imagine ISO ce permite instalarea
&#537;i/sau actualizarea distribu&#539;iei Mageia &#537;i prin extensie orice suport fizic
pe care poate fi copiat fi&#537;ierul ISO.
</p>
-
<p>Le pute&#539;i g&#259;si <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">aici</a>.
</p>
</div>
-
<div class="section" title="Mediile de instalare clasice">
<div class="titlepage">
@@ -124,7 +113,6 @@
</div>
</div>
-
<div class="section" title="Caracteristici comune">
<div class="titlepage">
@@ -136,7 +124,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -152,26 +139,6 @@
</p>
</li>
- </ul>
- </div>
-
- </div>
-
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
<li class="listitem">
<p>Diferitele medii pentru arhitectur&#259; pe 32 sau 64 de bi&#539;i.</p>
@@ -200,77 +167,30 @@
</div>
</div>
-
-
- <div class="section" title="DVD arhitectur&#259; dual&#259;">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e56"></a>DVD arhitectur&#259; dual&#259;
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p>Ambele arhitecturi s&icirc;nt prezente pe acela&#537;i mediu, alegerea este f&#259;cut&#259;
- automat &icirc;n func&#539;ie de tipul procesorului detectat.
- </p>
-
- </li>
- <li class="listitem">
-
- <p>Utilizeaz&#259; doar mediul de birou Xfce.</p>
-
- </li>
- <li class="listitem">
-
- <p>Nu s&icirc;nt disponibile toate limbile. (be, bg, ca, de, en, es, fr, it, mk, pl,
- pt, ru, sv, uk) DE VERIFICAT!
- </p>
-
- </li>
- <li class="listitem">
-
- <p>Con&#539;ine aplica&#539;ii proprietare.</p>
-
- </li>
- </ul>
- </div>
-
- </div>
</div>
-
<div class="section" title="Mediile Live">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e67"></a>Mediile Live
+ <h4 class="title"><a name="d5e53"></a>Mediile Live
</h4>
</div>
</div>
</div>
-
<div class="section" title="Caracteristici comune">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e69"></a>Caracteristici comune
+ <h5 class="title"><a name="d5e55"></a>Caracteristici comune
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -283,7 +203,7 @@
</li>
<li class="listitem">
- <p>Fiecare imagine ISO con&#539;ine numai un mediu de birou (KDE sau GNOME).</p>
+ <p>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</p>
</li>
<li class="listitem">
@@ -307,54 +227,50 @@
</div>
</div>
-
- <div class="section" title="LiveCD KDE">
+ <div class="section" title="Live DVD Plasma">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e83"></a>LiveCD KDE
+ <h5 class="title"><a name="d5e69"></a>Live DVD Plasma
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Doar mediul de birou KDE.</p>
+ <p>Plasma desktop environment only.</p>
</li>
<li class="listitem">
- <p>Doar limba englez&#259;.</p>
+ <p>Toate limbile s&icirc;nt prezente.</p>
</li>
<li class="listitem">
- <p>Doar 32 de bi&#539;i.</p>
+ <p>64 bit architecture only.</p>
</li>
</ul>
</div>
</div>
-
- <div class="section" title="LiveCD GNOME">
+ <div class="section" title="LiveDVD GNOME">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e92"></a>LiveCD GNOME
+ <h5 class="title"><a name="d5e78"></a>LiveDVD GNOME
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -365,72 +281,35 @@
</li>
<li class="listitem">
- <p>Doar limba englez&#259;.</p>
-
- </li>
- <li class="listitem">
-
- <p>Doar 32 de bi&#539;i.</p>
-
- </li>
- </ul>
- </div>
-
- </div>
-
-
- <div class="section" title="LiveDVD KDE">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e101"></a>LiveDVD KDE
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
- <li class="listitem">
-
- <p>Doar mediul de birou KDE.</p>
-
- </li>
- <li class="listitem">
-
<p>Toate limbile s&icirc;nt prezente.</p>
</li>
<li class="listitem">
- <p>Diferitele medii pentru arhitectur&#259; pe 32 sau 64 de bi&#539;i.</p>
+ <p>64 bit architecture only</p>
</li>
</ul>
</div>
</div>
-
- <div class="section" title="LiveDVD GNOME">
+ <div class="section" title="Live DVD Xfce">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e110"></a>LiveDVD GNOME
+ <h5 class="title"><a name="d5e87"></a>Live DVD Xfce
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Doar mediul de birou GNOME.</p>
+ <p>Xfce desktop environment only.</p>
</li>
<li class="listitem">
@@ -440,7 +319,7 @@
</li>
<li class="listitem">
- <p>Diferitele medii pentru arhitectur&#259; pe 32 sau 64 de bi&#539;i.</p>
+ <p>32 or 64 bit architectures.</p>
</li>
</ul>
@@ -449,31 +328,28 @@
</div>
</div>
-
<div class="section" title="CD-uri doar pentru demarat">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e119"></a>CD-uri doar pentru demarat
+ <h4 class="title"><a name="d5e96"></a>CD-uri doar pentru demarat
</h4>
</div>
</div>
</div>
-
<div class="section" title="Caracteristici comune">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e121"></a>Caracteristici comune
+ <h5 class="title"><a name="d5e98"></a>Caracteristici comune
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -510,26 +386,24 @@
</div>
</div>
-
- <div class="section" title="boot.iso">
+ <div class="section" title="netinstall.iso">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e132"></a>boot.iso
+ <h5 class="title"><a name="d5e109"></a>netinstall.iso
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Con&#539;ine numai aplica&#539;ii libere, pentru persoanele care refuz&#259; aplica&#539;iile
- proprietare.
+ <p>Contains only free software, for those people who prefer not to use non-free
+ software.
</p>
</li>
@@ -537,19 +411,17 @@
</div>
</div>
-
- <div class="section" title="boot-nonfree.iso">
+ <div class="section" title="netinstall-nonfree.iso">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e137"></a>boot-nonfree.iso
+ <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -568,130 +440,112 @@
</div>
</div>
-
<div class="section" title="Desc&#259;rcarea &#537;i verificarea mediilor">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e142"></a>Desc&#259;rcarea &#537;i verificarea mediilor
+ <h3 class="title"><a name="d5e119"></a>Desc&#259;rcarea &#537;i verificarea mediilor
</h3>
</div>
</div>
</div>
-
<div class="section" title="Desc&#259;rcare">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e144"></a>Desc&#259;rcare
+ <h4 class="title"><a name="d5e121"></a>Desc&#259;rcare
</h4>
</div>
</div>
</div>
-
- <p>Odat&#259; ce a&#539;i ales fi&#537;ierul ISO, &icirc;l pute&#539;i desc&#259;rca utiliz&icirc;nd HTTP sau
- BitTorrent. &Icirc;n ambele cazuri o fereastr&#259; v&#259; va oferi anumite informa&#539;ii,
- precum oglinda de desc&#259;rcare utilizat&#259; &#537;i posibilitatea de a o schimba dac&#259;
- este prea lent&#259;. Dac&#259; alege&#539;i HTTP, pute&#539;i vedea &#537;i ceva de genul
+ <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 an opportunity to change if the bandwidth is to low. If
+ http is chosen, you may also see something like
</p>
-
-
- <p>md5sum &#537;i sha1sum s&icirc;nt unelte pentru verificarea integrit&#259;&#539;ii imaginilor
- ISO. Utiliza&#539;i doar una din ele. P&#259;stra&#539;i una din ele <a class="link" href="Select-and-use-ISOs.html#integrity">pentru a o utiliza &#537;i mai t&icirc;rziu</a>. Apoi v&#259; va
- ap&#259;rea aceast&#259; fereastr&#259;:
+ <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 a window similar to this one appears:
</p>
-
-
<p>Bifa&#539;i butonul radio &#8222;Salveaz&#259; fi&#537;ierul&#8221;.</p>
</div>
-
- <div class="section" title="Se verific&#259; integritatea mediului desc&#259;rcat">
+ <div class="section" title="Checking the integrity of the downloaded media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e156"></a>Se verific&#259; integritatea mediului desc&#259;rcat
+ <h4 class="title"><a name="d5e133"></a>Checking the integrity of the downloaded media
</h4>
</div>
</div>
</div>
-
- <p>Ambele sume de control s&icirc;nt numere hexazecimale calculate de un algoritm cu
- fi&#537;ierul ce va fi desc&#259;rcat. C&icirc;nd &icirc;i cere&#539;i algoritmului s&#259; recalculeze
- acest num&#259;r din fi&#537;ierul pe care l-a&#539;i desc&#259;rcat, ori ob&#539;ine&#539;i acela&#537;i num&#259;r
- &#537;i desc&#259;rcarea s-a efectuat corect, ori num&#259;rul este diferit &#537;i a&#539;i &icirc;nt&icirc;lnit
- un e&#537;ec. &Icirc;n caz de e&#537;ec trebuie s&#259; &icirc;ncerca&#539;i s&#259;-l mai desc&#259;rca&#539;i o dat&#259;.
+ <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
+ failure. A failure infers that you should retry the download or attempt a
+ repair using BitTorrent.
</p>
-
<p>Deschide&#539;i o consol&#259;, trebuie s&#259; fi&#539;i root, &#537;i:</p>
-
<p>- Pentru a utiliza md5sum, tasta&#539;i: [sam@localhost]$ <strong class="userinput"><code>md5sum
path/to/the/image/file.iso</code></strong>.
</p>
-
<p>- Pentru a utiliza sha1sum, tasta&#539;i: [sam@localhost]$ <strong class="userinput"><code>sha1sum
path/to/the/image/file.iso</code></strong>.
</p>
-
<p>&#537;i compara&#539;i num&#259;rul ob&#539;inut pe calculator (va trebui s&#259; a&#537;tepta&#539;i un pic)
cu num&#259;rul dat de Mageia. Exemplu:
</p>
-
-
<p></p>
</div>
</div>
-
<div class="section" title="Inscrip&#539;iona&#539;i sau copia&#539;i imaginea ISO">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e169"></a>Inscrip&#539;iona&#539;i sau copia&#539;i imaginea ISO
+ <h3 class="title"><a name="d5e146"></a>Inscrip&#539;iona&#539;i sau copia&#539;i imaginea ISO
</h3>
</div>
</div>
</div>
-
<p>Imaginea ISO verificat&#259; poate fi acum inscrip&#539;ionat&#259; pe un CD/DVD sau pus&#259;
pe o cheie USB. Aceste opera&#539;ii nu s&icirc;nt simple copieri &#537;i au ca scop s&#259;
produc&#259; medie de pe care se poate demara.
</p>
-
<div class="section" title="Inscrip&#539;ionarea imaginii ISO pe un CD/DVD">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e172"></a>Inscrip&#539;ionarea imaginii ISO pe un CD/DVD
+ <h4 class="title"><a name="d5e149"></a>Inscrip&#539;ionarea imaginii ISO pe un CD/DVD
</h4>
</div>
</div>
</div>
-
<p>Pute&#539;i utiliza orice aplica&#539;ie de inscrip&#539;ionat dori&#539;i, &icirc;ns&#259; asigura&#539;i-v&#259; c&#259;
este configurat&#259; corect pe <span class="bold"><strong>inscrip&#539;ionat o
@@ -701,24 +555,21 @@
</p>
</div>
-
<div class="section" title="Pune&#539;i imaginea ISO pe o cheie USB">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e177"></a>Pune&#539;i imaginea ISO pe o cheie USB
+ <h4 class="title"><a name="d5e154"></a>Pune&#539;i imaginea ISO pe o cheie USB
</h4>
</div>
</div>
</div>
-
<p>Toate imaginile ISO Mageia s&icirc;nt hibride, asta &icirc;nseamn&#259; c&#259; pot fi &#8222;puse&#8221; pe o
cheie USB pentru a demara &#537;i instala sistemul.
</p>
-
<div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -738,67 +589,58 @@
</tr>
</table>
</div>
-
<p>Pentru a recupera capacitatea ini&#539;ial&#259; va trebui s&#259; reparti&#539;iona&#539;i &#537;i s&#259;
reformata&#539;i cheia USB.
</p>
-
<div class="section" title="Utiliz&icirc;nd o unealt&#259; grafic&#259; din Mageia">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e183"></a>Utiliz&icirc;nd o unealt&#259; grafic&#259; din Mageia
+ <h5 class="title"><a name="d5e160"></a>Utiliz&icirc;nd o unealt&#259; grafic&#259; din Mageia
</h5>
</div>
</div>
</div>
-
<p>Pute&#539;i utiliza un utilitar grafic precum <a class="ulink" href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks" target="_top">IsoDumper</a></p>
</div>
-
<div class="section" title="Utiliz&icirc;nd o unealt&#259; grafic&#259; din Windows">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e187"></a>Utiliz&icirc;nd o unealt&#259; grafic&#259; din Windows
+ <h5 class="title"><a name="d5e164"></a>Utiliz&icirc;nd o unealt&#259; grafic&#259; din Windows
</h5>
</div>
</div>
</div>
-
<p>Pute&#539;i &icirc;ncerca:</p>
-
<p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> utiliz&icirc;nd
op&#539;iunea &#8222;ISO image";
</p>
-
<p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32
Disk Imager</a></p>
</div>
-
<div class="section" title="Utiliz&icirc;nd linia de comand&#259; dintr-un sistem GNU/Linux">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e194"></a>Utiliz&icirc;nd linia de comand&#259; dintr-un sistem GNU/Linux
+ <h5 class="title"><a name="d5e171"></a>Utiliz&icirc;nd linia de comand&#259; dintr-un sistem GNU/Linux
</h5>
</div>
</div>
</div>
-
<div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -817,10 +659,8 @@
</tr>
</table>
</div>
-
<p>Pute&#539;i utiliza utilitarul dd &icirc;ntr-o consol&#259;:</p>
-
<div class="orderedlist">
<ol class="orderedlist" type="1">
@@ -834,7 +674,6 @@
<p>Deveni&#539;i root cu comanda <strong class="userinput"><code>su -</code></strong> (nu uita&#539;i liniu&#539;a de
la final '-' )
</p>
-
</li>
@@ -848,15 +687,12 @@
<li class="listitem">
<p>Introduce&#539;i comanda <strong class="userinput"><code>fdisk -l</code></strong></p>
-
-
<p>Alternativ, pute&#539;i ob&#539;ine numele dispozitivului cu comanda
<code class="code">dmesg</code>, la sf&icirc;r&#537;it ve&#539;i vedea numele dispozitivului &icirc;ncep&icirc;nd cu
<span class="emphasis"><em>sd</em></span>, sau <span class="emphasis"><em>sdd</em></span> &icirc;n acest caz:
</p>
-
<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
@@ -887,12 +723,10 @@
<p>Introduce&#539;i comanda: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX
bs=1M</code></strong></p>
-
<p>Unde X=numele dispozitivului, ex: /dev/sdc</p>
-
- <p>Exemplu: # <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
+ <p>Example: # <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
of=/dev/sdb bs=1M</code></strong></p>
</li>
diff --git a/ro/addUser.html b/ro/addUser.html
index 277108d..9c38a84 100644
--- a/ro/addUser.html
+++ b/ro/addUser.html
@@ -23,25 +23,8 @@
</div>
</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<div class="section" title="Defini&#539;i parola administratorului (root):">
<div class="titlepage">
@@ -53,7 +36,6 @@
</div>
</div>
-
<p>Pentru toate instal&#259;rile de <span class="application">Mageia</span> se recomand&#259;
s&#259; defini&#539;i o parol&#259; de superutilizator sau administrator, cunoscut&#259; &#537;i ca
@@ -63,7 +45,6 @@
trebui s&#259; retasta&#539;i parola &icirc;n c&#259;su&#539;a de dedesubt, astfel se vor compara cele
dou&#259; parole pentru a v&#259; asigura c&#259; nu a&#539;i tastat gre&#537;it.
</p>
-
<div class="note" title="Not&#259;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -85,7 +66,6 @@
</div>
</div>
-
<div class="section" title="Introduce&#539;i un utilizator">
<div class="titlepage">
@@ -97,14 +77,12 @@
</div>
</div>
-
<p>Ad&#259;uga&#539;i un utilizator la aceast&#259; etap&#259;. Un utilizator dispune de mai pu&#539;ine
drepturi ca un administrator (root), &icirc;ns&#259; suficiente pentru a putea naviga
pe Internet, utiliza aplica&#539;iile de birotic&#259;, juca jocuri sau orice altceva
ce un utilizator obi&#537;nuit poate face cu calculatorul s&#259;u.
</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -147,7 +125,6 @@
</li>
</ul>
</div>
-
<div class="note" title="Not&#259;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -158,30 +135,14 @@
<tr>
<td align="left" valign="top">
- <p>To&#539;i utilizatorii ad&#259;uga&#539;i &icirc;n cursul instal&#259;rii distribu&#539;iei Magaiea vor
- avea un director personal ce poate fi consultat de toat&#259; lumea (&icirc;ns&#259;
- protejat la scriere).
+ <p>Any user you add while installing Mageia, will have a both read and write
+ protected home directory (umask=0027).
</p>
-
- <p>Totu&#537;i, dup&#259; instalare, orice utilizator ad&#259;ugat cu <span class="emphasis"><em>MCC - Sistem -
- Gestiona&#539;i utilizatorii din sistem</em></span> vor avea un director personal
- protejat at&icirc;t la citire c&icirc;t &#537;i la scriere.
+ <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>Dac&#259; nu dori&#539;i un director personal accesibil &icirc;n citire de toat&#259; lumea, este
- recomandat s&#259; ad&#259;uga&#539;i acum doar un utilizator temporar &#537;i s&#259;-i ad&#259;uga&#539;i pe
- cei adev&#259;ra&#539;i dup&#259; repornire.
- </p>
-
-
- <p>Dac&#259; prefera&#539;i directoare personale accesibile &icirc;n citire pentru toat&#259; lumea,
- va trebui s&#259; ad&#259;uga&#539;i to&#539;i utilizatorii dori&#539;i &icirc;n etapa
- <span class="emphasis"><em>Configura&#539;ie - rezumat</em></span> aleg&icirc;nd <span class="emphasis"><em>Gestionare
- utilizatori</em></span>.
- </p>
-
<p>Drepturile de acces pot fi modificate &#537;i dup&#259; instalare.</p>
@@ -191,7 +152,6 @@
</div>
</div>
-
<div class="section" title="Gestionare avansat&#259; utilizatori">
<div class="titlepage">
@@ -203,16 +163,13 @@
</div>
</div>
-
<p>Dac&#259; ap&#259;sa&#539;i butonul <span class="guibutton">Avansat</span> vi se va prezenta un
ecran &icirc;n care ve&#539;i putea edita parametrii conturilor utilizatorilor pe care
&icirc;i ad&#259;uga&#539;i.
</p>
-
<p>Adi&#539;ional, pute&#539;i dezactiva sau activa un cont invitat.</p>
-
<div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -233,7 +190,6 @@
</tr>
</table>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
diff --git a/ro/chooseDesktop.html b/ro/chooseDesktop.html
index 5f9a58d..7325b40 100644
--- a/ro/chooseDesktop.html
+++ b/ro/chooseDesktop.html
@@ -22,30 +22,25 @@
</div>
</div>
</div>
+
-
-
-
-
-
+
-
+
<p>&Icirc;n func&#539;ie de alegerea de aici vi se vor prezenta ecrane suplimentare pentru
a v&#259; afina alegerea.
</p>
-
+
<p>Dup&#259; etapa de selec&#539;ie, ve&#539;i vedea o diaporam&#259; pe parcursul instal&#259;rii
pachetelor. Diaporama se poate dezactiva ap&#259;s&icirc;nd pe butonul
<span class="guilabel">Detalii</span>.
</p>
+
-
-
-
-
+
<p>Alege&#539;i dac&#259; prefera&#539;i s&#259; utiliza&#539;i mediul de birou
<span class="application">KDE</span> sau <span class="application">Gnome</span>. Ambele
vin cu o colec&#539;ie de aplica&#539;ii &#537;i unelte folositoare. Ap&#259;sa&#539;i pe
@@ -55,7 +50,7 @@
este mai lejer dec&icirc;t celelalte dou&#259;, poate nu at&icirc;t de pl&#259;cut ochiului &#537;i cu
mai pu&#539;ine pachete instalate implicit.
</p>
-
+
</div>
</body>
</html>
diff --git a/ro/choosePackageGroups.html b/ro/choosePackageGroups.html
index 6e6c78a..966d7b2 100644
--- a/ro/choosePackageGroups.html
+++ b/ro/choosePackageGroups.html
@@ -22,52 +22,52 @@
</div>
</div>
</div>
+
-
-
-
-
+
+
-
+
<p>Pachetele au fost sortate &icirc;n grupuri pentru a v&#259; facilita alegerea a ceea ce
este necesar pentru acest sistem. Con&#539;inutul grupurilor este evident,
totu&#537;i, informa&#539;ii suplimentare despre con&#539;inutul fiec&#259;rui pachet s&icirc;nt
disponibile &icirc;n infobule c&icirc;nd le survola&#539;i cu mausul.
</p>
-
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-
- <p>Sta&#539;ie de lucru.</p>
+ <p>Sta&#539;ie de lucru.</p>
+
</li>
<li class="listitem">
-
- <p>Server.</p>
+ <p>Server.</p>
+
</li>
<li class="listitem">
-
- <p>Mediu grafic de lucru</p>
+ <p>Mediu grafic de lucru</p>
+
</li>
<li class="listitem">
-
+
<p>Selectare individual&#259; a pachetelor: pute&#539;i utiliza aceast&#259; op&#539;iune pentru a
ad&#259;uga sau &icirc;nl&#259;tura manual pachetele.
</p>
-
+
</li>
</ul>
</div>
-
- <p>Pentru intruc&#539;iuni despre cum s&#259; face&#539;i o instalare minimalist&#259; (cu sau
- f&#259;r&#259; X &amp; IceWM), citi&#539;i <a class="xref" href="minimal-install.html" title="Instalare minimal&#259;">&#8222;Instalare minimal&#259;&#8221;</a>.
- </p>
+
+ <p>Read <a class="xref" href="minimal-install.html" title="Instalare minimal&#259;">&#8222;Instalare minimal&#259;&#8221;</a> for instructions on how to do a
+ minimal install (without or with X &amp; IceWM).
+ </p>
+
</div>
</body>
</html>
diff --git a/ro/diskdrake.html b/ro/diskdrake.html
index 2176d94..3bfab41 100644
--- a/ro/diskdrake.html
+++ b/ro/diskdrake.html
@@ -29,18 +29,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
<div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -101,8 +89,8 @@
<tr>
<td align="left" valign="top">
- <p>Dac&#259; instala&#539;i Mageia pe un sistem UEFI, verifica&#539;i c&#259; o parti&#539;ie de sistem
- EFI (ESP) este prezent&#259; &#537;i montat&#259; corect &icirc;n /boot/EFI (a se vedea mai sus)
+ <p>If you are installing Mageia on an UEFI system, check that an ESP (EFI
+ System Partition) is present and correctly mounted on /boot/EFI (see below)
</p>
@@ -113,6 +101,27 @@
</table>
</div>
+
+ <div class="note" title="Not&#259;" 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="[Not&#259;]" 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>
+
</div>
</body>
</html>
diff --git a/ro/doPartitionDisks.html b/ro/doPartitionDisks.html
index 207aa40..e2ca2fd 100644
--- a/ro/doPartitionDisks.html
+++ b/ro/doPartitionDisks.html
@@ -223,6 +223,32 @@
</div>
+ <div class="note" title="Not&#259;" 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="[Not&#259;]" 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>
+
+
<div class="warning" title="Avertisment" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
diff --git a/ro/exitInstall.html b/ro/exitInstall.html
index 031d37a..467efcb 100644
--- a/ro/exitInstall.html
+++ b/ro/exitInstall.html
@@ -22,16 +22,11 @@
</div>
</div>
</div>
-
-
-
-
-
-
+
+
-
<p><a name="exitInstall-pa1"></a>A&#539;i terminat de instalat &#537;i configurat distribu&#539;ia
@@ -47,19 +42,17 @@
<p><a name="exitInstall-pa3"></a>Dac&#259; nu ajusta&#539;i parametrii &icirc;nc&#259;rc&#259;torului de sistem, distribu&#539;ia Mageia va
- fi selectat&#259; &#537;i pornit&#259; automat.
+ fi selectat&#259; &#537;i pornit&#259; automat.
</p>
-
+
<p><a name="exitInstall-pa4"></a>Profita&#539;i!
</p>
-
+
<p><a name="exitInstall-pa5"></a>Vizita&#539;i www.mageia.org dac&#259; ave&#539;i &icirc;ntreb&#259;ri sau dac&#259; dori&#539;i s&#259; contribui&#539;i
- la Mageia
+ la Mageia
</p>
-
-
</div>
</body>
diff --git a/ro/index.html b/ro/index.html
index 0ac8526..93ed37f 100644
--- a/ro/index.html
+++ b/ro/index.html
@@ -28,8 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Introducere</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Medii</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e142">Desc&#259;rcarea &#537;i verificarea mediilor</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e169">Inscrip&#539;iona&#539;i sau copia&#539;i imaginea ISO</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Desc&#259;rcarea &#537;i verificarea mediilor</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Inscrip&#539;iona&#539;i sau copia&#539;i imaginea ISO</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, instalatorul Mageia</a></span></dt>
@@ -75,17 +75,14 @@
<dt><span class="section"><a href="setupBootloader.html">Op&#539;iunile principale ale &icirc;nc&#259;rc&#259;torului de sistem</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="setupBootloader.html#d5e903">Cu un sistem BIOS</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e940">Cu un sistem UEFI</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e887">Bootloader interface</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e911">Se utilizeaz&#259; un &icirc;nc&#259;rc&#259;tor de sistem Mageia</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e925">Se utilizeaz&#259; &icirc;nc&#259;rc&#259;torul de sistem existent</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e928">Using chain loading</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e942">Options</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Ad&#259;uga&#539;i sau modifica&#539;i o intrare din meniul de demaraj</a></span></dt>
- <dd>
- <dl>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e955">Cu un sistem BIOS</a></span></dt>
- <dt><span class="section"><a href="setupBootloaderAddEntry.html#d5e972">Cu un sistem UEFI</a></span></dt>
- </dl>
- </dd>
<dt><span class="section"><a href="misc-params.html">Rezumatul parametrilor diver&#537;i</a></span></dt>
<dd>
<dl>
@@ -116,7 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Dezinstalare Mageia</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1210">&Icirc;ndrumar</a></span></dt>
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1248">&Icirc;ndrumar</a></span></dt>
</dl>
</dd>
</dl>
diff --git a/ro/misc-params.html b/ro/misc-params.html
index 533ebc7..8ffc6d5 100644
--- a/ro/misc-params.html
+++ b/ro/misc-params.html
@@ -29,28 +29,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<p><a name="misc-params-pa1"></a>DrakX a f&#259;cut alegeri inteligente pentru configura&#539;ia sistemului &icirc;n func&#539;ie
de op&#539;iunile pe care le-a&#539;i ales &#537;i de componentele materiale
detectate. Pute&#539;i verifica parametrii aici, iar dac&#259; dori&#539;i &icirc;i pute&#539;i
@@ -58,6 +36,44 @@
</p>
+ <div class="note" title="Not&#259;" 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="[Not&#259;]" 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>
+
+
<div class="section" title="Parametri sistem">
<div class="titlepage">
<div>
@@ -99,7 +115,7 @@
</p>
- <p><a name="misc-params-system-pa4b"></a>Nu schimba&#539;i nimic dac&#259; nu &#537;ti&#539;i cum s&#259; configura&#539;i Grub &#537;i/sau Lilo
+ <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2
</p>
@@ -165,6 +181,25 @@
<p><a name="misc-params-hardware-pa1a"></a>Aici pute&#539;i configura sau schimba dispunerea tastaturii, care va depinde de
loca&#539;ia voastr&#259;, de limb&#259; &#537;i de tipul tastaturii.
</p>
+
+
+ <div class="note" title="Not&#259;" 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="[Not&#259;]" 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>
</li>
<li class="listitem">
@@ -183,7 +218,7 @@
<p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Plac&#259; de sunet</span>:
</p>
-
+
<p><a name="misc-params-hardware-pa3a"></a>Instalatorul utilizeaz&#259; pilotul implicit, dac&#259; exist&#259;. Op&#539;iunea pentru a
selec&#539;iona un alt pilot este propus&#259; numai c&icirc;nd exist&#259; mai mul&#539;i pilo&#539;i
pentru acest&#259; plac&#259;, &icirc;ns&#259; nici unul dintre ei nu este cel implicit.
@@ -322,8 +357,9 @@
</p>
- <p><a name="misc-params-security-pa2b"></a>Selecta&#539;i serviciile care dori&#539;i s&#259; aib&#259; acces la sistem. Selec&#539;iile vor
- depinde de modul &icirc;n care utiliza&#539;i calculatorul.
+ <p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your
+ selections will depend on what you use your computer for. For more
+ information, see <a class="xref" href="">???</a>.
</p>
diff --git a/ro/selectCountry.html b/ro/selectCountry.html
index 0a1055e..5f24095 100644
--- a/ro/selectCountry.html
+++ b/ro/selectCountry.html
@@ -22,30 +22,24 @@
</div>
</div>
</div>
+
+
+
-
-
-
-
-
-
-
-
-
- <p><a name="selectCountry-pa1"></a>Selecta&#539;i &#539;ara sau regiunea. Acest lucru este important pentru multe tipuri
- de parametri, precum moneda local&#259; &#537;i domeniul de reglementare
- radio. Alegerea gre&#537;it&#259; a &#539;&#259;rii poate conduce la incapacitatea de a utiliza
- re&#539;elele f&#259;r&#259; fir.
+
+ <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
+ like the currency and wireless regulatory domain. Setting the wrong country
+ can lead to not being able to use a Wireless network.
</p>
-
+
<p><a name="selectCountry-pa2"></a>Dac&#259; &#539;ara dorit&#259; nu este &icirc;n list&#259;, face&#539;i clic pe butonul <span class="guilabel">Alte
&#539;&#259;ri</span> &#537;i alege&#539;i de acolo &#539;ara / regiunea.
</p>
-
+
<div class="note" title="Not&#259;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -54,19 +48,19 @@
</tr>
<tr>
<td align="left" valign="top">
-
+
<p><a name="selectCountry-pa3"></a>Dac&#259; &#539;ara dorit&#259; se afl&#259; doar &icirc;n lista <span class="guilabel">Alte &#539;&#259;ri</span>, dup&#259;
ce face&#539;i clic pe <span class="guibutton">OK</span> poate ap&#259;rea c&#259; o &#539;ar&#259; din prima
list&#259; a fost aleas&#259;. Ignora&#539;i acest lucru, DrakX va continua cu alegerea pe
care a&#539;i f&#259;cut-o.
</p>
-
+
</td>
</tr>
</table>
</div>
-
+
<div class="section" title="Metod&#259; de intrare">
<div class="titlepage">
<div>
@@ -76,22 +70,19 @@
</div>
</div>
</div>
+
-
-
-
- <p><a name="selectCountry-pa4"></a>&Icirc;n ecranul <span class="guilabel">Alte &#539;&#259;ri</span> pute&#539;i selecta &#537;i metoda de
- intrare (la baza listei). Metodele de intrare permit utilizatorilor s&#259; scrie
- cu caractere multilingve (chinez&#259;, japonez&#259;, coreean&#259;, etc.). IBus este
- metoda de intrare implicit&#259; pe DVD-urile Mageia &#537;i pe Live CD-urile
- Africa/India &#537;i Asia/no-India. Pentru localele asiatice &#537;i africane, IBus va
- fi definit drept metoda de intrare implicit&#259;, a&#537;a c&#259; utilizatorii nu vor mai
- trebui s-o configureze manual. Celelalte metode de intrare (SCIM, GCIN,
- HIME, etc.) care ofer&#259; func&#539;ii similare pot fi instalate dac&#259; a&#539;i ad&#259;ugat
- mediile HTTP/FTP &icirc;nainte de selec&#539;ia pachetelor.
+
+ <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>
-
+
<div class="note" title="Not&#259;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -100,19 +91,19 @@
</tr>
<tr>
<td align="left" valign="top">
-
- <p><a name="selectCountry-pa5"></a>Dac&#259; a&#539;i omis configurarea metodei de intrare &icirc;n timpul instal&#259;rii, o pute&#539;i
- accesa dup&#259; redemararea sistemului instalat via &#8222;Configura&#539;i calculatorul&#8221;
- -&gt; &#8222;Sistem&#8221; sau execut&icirc;nd localedrake ca root.
- </p>
+ <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>
+
</td>
</tr>
</table>
</div>
-
+
</div>
-
+
</div>
</body>
</html>
diff --git a/ro/setupBootloader.html b/ro/setupBootloader.html
index 10ac7fb..cc23506 100644
--- a/ro/setupBootloader.html
+++ b/ro/setupBootloader.html
@@ -29,13 +29,11 @@
-
-
- <div class="section" title="Cu un sistem BIOS">
+ <div class="section" title="Bootloader interface">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e903"></a>Cu un sistem BIOS
+ <h3 class="title"><a name="d5e887"></a>Bootloader interface
</h3>
</div>
</div>
@@ -43,15 +41,23 @@
- <p><a name="setupBootloader-pa1"></a>Dac&#259; prefera&#539;i al&#539;i parametri pentru &icirc;nc&#259;rc&#259;torul de sistem &icirc;n locul celor
- ale&#537;i automatic de instalator, &icirc;n acest caz &icirc;i pute&#539;i schimba aici.
- </p>
+ <p>By default, Mageia uses exclusively:</p>
- <p><a name="setupBootloader-pa2"></a>Dac&#259; ave&#539;i deja instalat un alt sistem de operare pe calculator, &icirc;n acest
- caz trebuie s&#259; v&#259; decide&#539;i ori s&#259; ad&#259;uga&#539;i Mageia la &icirc;nc&#259;rc&#259;torul de sistem
- existent, ori s&#259; l&#259;sa&#539;i Mageia s&#259; creeze unul nou.
- </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>
<div class="tip" title="Indica&#539;ie" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -63,7 +69,7 @@
<tr>
<td align="left" valign="top">
- <p>Meniurile grafice Mageia s&icirc;nt frumoase:</p>
+ <p>The Mageia graphical menus are nice :)</p>
</td>
</tr>
@@ -71,11 +77,11 @@
</div>
- <div class="section" title="Se utilizeaz&#259; un &icirc;nc&#259;rc&#259;tor de sistem Mageia">
+ <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="usingMageiaBootloader"></a>Se utilizeaz&#259; un &icirc;nc&#259;rc&#259;tor de sistem Mageia
+ <h4 class="title"><a name="d5e897"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
</h4>
</div>
</div>
@@ -83,50 +89,18 @@
- <p><a name="setupBootloader-pa4"></a>Implicit Mageia scrie un nou &icirc;nc&#259;rc&#259;tor de sistem GRUB (&icirc;nvechit) pe MBR
- (&#8222;Master Boot Record&#8221;, sectorul principal de demaraj) de pe primul disc
- dur. Dac&#259; ave&#539;i deja instalate &#537;i alte sisteme de operare, Mageia va &icirc;ncerca
- s&#259; le adauge &icirc;n noul meniu de demaraj.
- </p>
-
-
- <p>De asemenea, Mageia propune GRUB2 ca &icirc;nc&#259;rc&#259;tor de sistem op&#539;ional &icirc;n plus
- de GRUB (&icirc;nvechit) &#537;i Lilo.
- </p>
- <div class="warning" title="Avertisment" 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="[Avertisment]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><a name="setupBootloader-pa6"></a>Sistemele Linux care utilizeaz&#259; GRUB2 ca &icirc;nc&#259;rc&#259;tor de sistem nu s&icirc;nt
- suportate &icirc;n momentul de fa&#539;&#259; de GRUB (&icirc;nvechit) &#537;i nu vor fi recunoscute
- dac&#259; este utilizat &icirc;nc&#259;rc&#259;torul de sistem GRUB implicit.
- </p>
-
-
- <p>Cea mai bun&#259; solu&#539;ie aici este s&#259; utiliza&#539;i &icirc;nc&#259;rc&#259;torul de sistem GRUB2
- care este disponibil &icirc;n pagina rezumat din cursul instal&#259;rii.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
+ <p>Nu modifica&#539;i &#8222;Dispozitivul de demaraj&#8221; doar dac&#259; &#537;ti&#539;i ce face&#539;i.</p>
</div>
- <div class="section" title="Se utilizeaz&#259; &icirc;nc&#259;rc&#259;torul de sistem existent">
+ <div class="section" title="Grub2-efi on UEFI systems">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="usingExistingBootloader"></a>Se utilizeaz&#259; &icirc;nc&#259;rc&#259;torul de sistem existent
+ <h4 class="title"><a name="d5e903"></a>Grub2-efi on UEFI systems
</h4>
</div>
</div>
@@ -134,85 +108,100 @@
- <p><a name="setupBootloader-pa46"></a>Dac&#259; a&#539;i decis s&#259; utiliza&#539;i un &icirc;nc&#259;rc&#259;tor de sistem existent, atunci va
- trebui s&#259; nu uita&#539;i s&#259; V&#258; OPRI&#538;I la pagina rezumat din cursul instal&#259;rii &#537;i
- s&#259; face&#539;i clic pe butonul <span class="guibutton">Configureaz&#259;</span> de l&icirc;ng&#259;
- &icirc;nc&#259;rc&#259;torul de sistem pentru a schimba loca&#539;ia de instalare a
- &icirc;nc&#259;rc&#259;torului de sistem.
+ <p>With an UEFI system, the user interface is slightly different as you cannot
+ choose between with or without graphical menu
</p>
- <p><a name="setupBootloader-pa47"></a>Nu selecta&#539;i dispozitivul intitulat spre exemplu &#8222;sda&#8221;, c&#259; ve&#539;i suprascrie
- sectorul principal de demaraj (MBR) existent. Trebuie s&#259; selecta&#539;i parti&#539;ia
- r&#259;d&#259;cin&#259; (/) pe care a&#539;i ales-o &icirc;n etapa de parti&#539;ionare precedent&#259; (de
- exemplu: sda7).
- </p>
- <p><a name="setupBootloader-pa48"></a>Ca s&#259; fie clar: sda este un dispozitiv, iar sda7 este o parti&#539;ie de pe acel
- dispozitiv.
+ <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>
- <div class="tip" title="Indica&#539;ie" 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="[Indica&#539;ie]" src="tip.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p><a name="setupBootloader-pa48a"></a>Trece&#539;i &icirc;n terminalul tty2 cu Ctrl+Alt+F2 &#537;i tasta&#539;i <code class="literal">df</code>
- ca s&#259; verifica&#539;i unde se afl&#259; parti&#539;ia <code class="literal">/</code>
- (r&#259;d&#259;cin&#259;). Ctrl+Alt+F7 v&#259; readuce &icirc;n ecranul instalatorului.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
- <p><a name="setupBootloader-pa49"></a>Procedura exact&#259; pentru ad&#259;ugarea sistemului Mageia la un &icirc;nc&#259;rc&#259;tor de
- sistem existent dep&#259;&#537;e&#537;te scopul acestui ajutor. Totu&#537;i, &icirc;n majoritatea
- cazurilor, acest lucru implic&#259; lansarea programului de instalare al acelui
- &icirc;nc&#259;rc&#259;tor de sistem, care ar trebui s&#259; detecteze &#537;i s&#259; adauge automat noul
- sistem Mageia. Consulta&#539;i documenta&#539;ia sistemului de operare &icirc;n chestiune.
- </p>
+ <p>Nu modifica&#539;i &#8222;Dispozitivul de demaraj&#8221; doar dac&#259; &#537;ti&#539;i ce face&#539;i.</p>
</div>
+
+ </div>
+
+
+ <div class="section" title="Se utilizeaz&#259; un &icirc;nc&#259;rc&#259;tor de sistem Mageia">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e911"></a>Se utilizeaz&#259; un &icirc;nc&#259;rc&#259;tor de sistem Mageia
+ </h3>
+ </div>
+ </div>
+ </div>
+
- <div class="section" title="Op&#539;iunile avansate ale &icirc;nc&#259;rc&#259;torului de sistem">
- <div class="titlepage">
+ <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="Se utilizeaz&#259; &icirc;nc&#259;rc&#259;torul de sistem existent">
+ <div class="titlepage">
+ <div>
<div>
- <div>
- <h4 class="title"><a name="advancedOptionBootloader"></a>Op&#539;iunile avansate ale &icirc;nc&#259;rc&#259;torului de sistem
- </h4>
- </div>
+ <h3 class="title"><a name="d5e925"></a>Se utilizeaz&#259; &icirc;nc&#259;rc&#259;torul de sistem existent
+ </h3>
</div>
</div>
-
-
-
- <p><a name="setupBootloader-pa52"></a>Dac&#259; dispune&#539;i de un spa&#539;iu limitat pe parti&#539;ia <code class="literal">/</code>, iar
- aceasta con&#539;ine <code class="literal">/tmp</code>, face&#539;i clic pe
- <span class="guibutton">Avansat</span> &#537;i bifa&#539;i c&#259;su&#539;a <span class="guilabel">Cur&#259;&#539;&#259; /tmp la
- fiecare pornire</span>. Acest lucru v&#259; ajut&#259; s&#259; men&#539;ine&#539;i ceva spa&#539;iu
- liber.
- </p>
-
</div>
+
+
+
+ <p>Procedura exact&#259; pentru ad&#259;ugarea sistemului Mageia la un &icirc;nc&#259;rc&#259;tor de
+ sistem existent dep&#259;&#537;e&#537;te scopul acestui ajutor. Totu&#537;i, &icirc;n majoritatea
+ cazurilor, acest lucru implic&#259; lansarea programului de instalare al acelui
+ &icirc;nc&#259;rc&#259;tor de sistem, care ar trebui s&#259; detecteze &#537;i s&#259; adauge automat noul
+ sistem Mageia. Consulta&#539;i documenta&#539;ia sistemului de operare &icirc;n chestiune.
+ </p>
</div>
- <div class="section" title="Cu un sistem UEFI">
+ <div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e940"></a>Cu un sistem UEFI
+ <h3 class="title"><a name="d5e928"></a>Using chain loading
</h3>
</div>
</div>
@@ -220,25 +209,190 @@
- <p>Pe un sistem UEFI interfa&#539;a utilizator este un pic diferit&#259; deoarece nu
- pute&#539;i alege &icirc;nc&#259;rc&#259;torul de sistem din moment ce numai Grub2-efi este
- disponibil.
+ <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>
- <p>Dac&#259; Mageia este primul sistem instalat pe calculator, instalatorul a creat
- o ESP (Parti&#539;ie de Sistem EFI) pentru a g&#259;zdui &icirc;nc&#259;rc&#259;torul de sistem
- (Grub2-efi). Dac&#259; se afla dinainte &#537;i un alt sistem de operare UEFI instalat
- pe calculator (Windows 8 de exemplu), instalatorul Mageia a detectat
- parti&#539;ia ESP creat&#259; de Windows &#537;i a ad&#259;ugat Grub2-efi. Este totu&#537;i posibil
- s&#259; ave&#539;i mai multe parti&#539;ii ESP, &icirc;ns&#259; una este suficient&#259; indiferent de c&icirc;t
- de multe sisteme de operare ave&#539;i instalate pe calculator.
+ <p>You will get a warning that the bootloader is missing, ignore it by clicking
+ <span class="guibutton">OK</span>.
</p>
- <p>Nu modifica&#539;i &#8222;Dispozitivul de demaraj&#8221; doar dac&#259; &#537;ti&#539;i ce face&#539;i.</p>
+
+ </div>
+
+
+ <div class="section" title="Options">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e942"></a>Options
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div class="section" title="First page">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e944"></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 a username and password will be asked at the boot
+ time to select a booting entry or change settings. The username is "root"
+ and the password is the one chosen here after.
+ </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="d5e976"></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>
</div>
diff --git a/ro/setupBootloaderAddEntry.html b/ro/setupBootloaderAddEntry.html
index 4fdafb3..a65c389 100644
--- a/ro/setupBootloaderAddEntry.html
+++ b/ro/setupBootloaderAddEntry.html
@@ -27,113 +27,25 @@
+ <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="section" title="Cu un sistem BIOS">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e955"></a>Cu un sistem BIOS
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>Pute&#539;i ad&#259;uga o intrare sau modifica una dup&#259; ce a&#539;i selectat-o, ap&#259;s&icirc;nd pe
- butonul corespunz&#259;tor din ecranul <span class="emphasis"><em>Configurare &icirc;nc&#259;rc&#259;tor de
- sistem</em></span> &#537;i edit&icirc;nd intr&#259;rile din fereastra care se afi&#537;eaz&#259; &icirc;n
- acel moment.
- </p>
-
-
- <div class="note" title="Not&#259;" 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="[Not&#259;]" src="note.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Dac&#259; a&#539;i ales <code class="code">Grub 2</code> ca &icirc;nc&#259;rc&#259;tor de sistem nu pute&#539;i utiliza
- aceast&#259; unealt&#259; pentru a edita intr&#259;rile &icirc;n aceast&#259; etap&#259;, ap&#259;sa&#539;i
- &#8222;&Icirc;nainte&#8221;. Va trebui s&#259; edita&#539;i manual <code class="code">/boot/grub2/custom.cfg</code>
- sau s&#259; utiliza&#539;i <code class="code">grub-customizer</code>.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
-
-
-
- <p>Schimbarea numelui unei intr&#259;ri &#537;i bifarea c&#259;su&#539;ei pentru a o defini ca
- intrare implicit&#259; s&icirc;nt ac&#539;iuni care nu comport&#259; nici un risc.
- </p>
-
-
- <p>Pute&#539;i ad&#259;uga propriul vostru num&#259;r de versiune pentru o intrare, sau o
- pute&#539;i redenumi &icirc;n &icirc;ntregime.
- </p>
-
-
- <p>Intrarea implicit&#259; este cea pe care sistemul o va demara dac&#259; nu face&#539;i nici
- o alegere la pornire.
- </p>
-
-
- <div class="warning" title="Avertisment" 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="[Avertisment]" src="warning.png"></td>
- <th align="left"></th>
- </tr>
- <tr>
- <td align="left" valign="top">
-
- <p>Editarea altor lucruri v&#259; poate conduce la un sistem nedemarabil. Nu
- &icirc;ncerca&#539;i s&#259; testa&#539;i ceva dac&#259; nu &#537;ti&#539;i ce face&#539;i.
- </p>
-
- </td>
- </tr>
- </table>
- </div>
-
- </div>
-
-
- <div class="section" title="Cu un sistem UEFI">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e972"></a>Cu un sistem UEFI
- </h3>
- </div>
- </div>
- </div>
-
-
-
- <p>&Icirc;n acest caz utiliza&#539;i Grub2-efi &#537;i nu pute&#539;i utiliza aceast&#259; unealt&#259; pentru
- a edita intr&#259;rile &icirc;n aceast&#259; etap&#259;. Pentru a face acest lucru va trebui s&#259;
- edita&#539;i manual <code class="code">/boot/grub2/custom.cfg</code> sau mai bine utiliza&#539;i
- <code class="code">grub-customizer</code>. Tot ce pute&#539;i face aici este s&#259; alege&#539;i
- intrarea implicit&#259; din lista derulant&#259;.
- </p>
-
-
- <p>Dup&#259; ce ap&#259;sa&#539;i pe butonul <span class="guibutton">&Icirc;nainte</span> o alt&#259; list&#259;
- derulant&#259; v&#259; permite s&#259; alege&#539;i rezolu&#539;ia video pentru Grub2 care este un
- &icirc;nc&#259;rc&#259;tor grafic de sistem.
- </p>
-
-
-
+ <div class="note" title="Not&#259;" 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="[Not&#259;]" 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>
</div>
diff --git a/ro/soundConfig.html b/ro/soundConfig.html
index 0874099..75b522d 100644
--- a/ro/soundConfig.html
+++ b/ro/soundConfig.html
@@ -22,7 +22,6 @@
</div>
</div>
</div>
-
@@ -32,8 +31,8 @@
<p>Acest ecran afi&#537;eaz&#259; numele pilotului pe care instalatorul l-a ales pentru
placa de sunet, care va fi cel implicit dac&#259; exist&#259; unul.
-
</p>
+
<p>Pilotul implicit ar trebui s&#259; func&#539;ioneze f&#259;r&#259; probleme. Totu&#537;i, dac&#259;
&icirc;nt&icirc;lni&#539;i probleme dup&#259; instalare, atunci executa&#539;i
@@ -41,13 +40,12 @@
Control Center), aleg&icirc;nd categoria <span class="guilabel">Componente materiale</span>
&#537;i face&#539;i clic pe <span class="guilabel">Configurare sunet</span> &icirc;n partea din
dreapta sus a ecranului.
-
</p>
+
<p>Apoi, &icirc;n draksound sau ecranul uneltei de &#8222;Configurarea sunetului&#8221;, ap&#259;sa&#539;i
pe <span class="guibutton">Avansat</span> &#537;i apoi pe <span class="guibutton">Depanare</span>
pentru a g&#259;si sfaturi utile despre cum s&#259; rezolva&#539;i problema.
-
</p>
@@ -66,15 +64,12 @@
<p>Ap&#259;sarea pe <span class="guibutton">Avansat</span> &icirc;n acest ecran, &icirc;n cursul
instal&#259;rii, este util&#259; dac&#259; nu exist&#259; un pilot implicit dar s&icirc;nt c&icirc;&#539;iva
disponibili &#537;i crede&#539;i c&#259; instalatorul l-a selec&#539;ionat pe cel gre&#537;it.
-
</p>
<p>&Icirc;n acel caz pute&#539;i selecta un pilot diferit dup&#259; ce face&#539;i clic pe
<span class="guibutton">Alegerea unui pilot</span>.
-
</p>
-
</div>
diff --git a/ro/uninstall-Mageia.html b/ro/uninstall-Mageia.html
index 0801449..63456ee 100644
--- a/ro/uninstall-Mageia.html
+++ b/ro/uninstall-Mageia.html
@@ -31,7 +31,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e1210"></a>&Icirc;ndrumar
+ <h3 class="title"><a name="d5e1248"></a>&Icirc;ndrumar
</h3>
</div>
</div>
diff --git a/sl/Select-and-use-ISOs.html b/sl/Select-and-use-ISOs.html
index ce19d2e..742e2c7 100644
--- a/sl/Select-and-use-ISOs.html
+++ b/sl/Select-and-use-ISOs.html
@@ -23,9 +23,7 @@
</div>
</div>
-
-
<div class="section" title="Predstavitev">
<div class="titlepage">
@@ -37,15 +35,12 @@
</div>
</div>
-
<p>Mageia is distributed via ISO images. This page will help you to choose
which image match your needs.
</p>
-
<p>There is two families of media:</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -68,12 +63,10 @@
</li>
</ul>
</div>
-
<p>Details are given in the next sections.</p>
</div>
-
<div class="section" title="Vir">
<div class="titlepage">
@@ -85,7 +78,6 @@
</div>
</div>
-
<div class="section" title="Definicija">
<div class="titlepage">
@@ -97,19 +89,16 @@
</div>
</div>
-
<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>
-
<p>Najdete jih <a class="ulink" href="http://www.mageia.org/sl/downloads/" target="_top">tukaj</a>.
</p>
</div>
-
<div class="section" title="Mediji za klasi&#269;no namestitev">
<div class="titlepage">
@@ -121,7 +110,6 @@
</div>
</div>
-
<div class="section" title="Skupne zna&#269;ilnosti">
<div class="titlepage">
@@ -133,7 +121,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -151,7 +138,6 @@
</div>
</div>
-
<div class="section" title="DVD">
<div class="titlepage">
@@ -163,13 +149,12 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Different media for architecture 32 or 64 bits.</p>
+ <p>Different media for 32 or 64 bit architectures.</p>
</li>
<li class="listitem">
@@ -195,7 +180,6 @@
</div>
</div>
-
<div class="section" title="Live media">
<div class="titlepage">
@@ -207,7 +191,6 @@
</div>
</div>
-
<div class="section" title="Skupne zna&#269;ilnosti">
<div class="titlepage">
@@ -219,7 +202,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -256,7 +238,6 @@
</div>
</div>
-
<div class="section" title="Live DVD Plasma">
<div class="titlepage">
@@ -268,7 +249,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -291,7 +271,6 @@
</div>
</div>
-
<div class="section" title="Live DVD GNOME">
<div class="titlepage">
@@ -303,7 +282,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -326,7 +304,6 @@
</div>
</div>
-
<div class="section" title="Live DVD Xfce">
<div class="titlepage">
@@ -338,7 +315,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -363,7 +339,6 @@
</div>
</div>
-
<div class="section" title="Boot-only CD media">
<div class="titlepage">
@@ -375,7 +350,6 @@
</div>
</div>
-
<div class="section" title="Skupne zna&#269;ilnosti">
<div class="titlepage">
@@ -387,7 +361,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -423,7 +396,6 @@
</div>
</div>
-
<div class="section" title="netinstall.iso">
<div class="titlepage">
@@ -435,7 +407,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -450,7 +421,6 @@
</div>
</div>
-
<div class="section" title="netinstall-nonfree.iso">
<div class="titlepage">
@@ -462,7 +432,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -481,7 +450,6 @@
</div>
</div>
-
<div class="section" title="Downloading and Checking Media">
<div class="titlepage">
@@ -493,7 +461,6 @@
</div>
</div>
-
<div class="section" title="Prejemanje">
<div class="titlepage">
@@ -505,29 +472,23 @@
</div>
</div>
-
<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>
-
-
<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>
-
-
<p>Check the radio button Save File.</p>
</div>
-
<div class="section" title="Checking the downloaded media integrity">
<div class="titlepage">
@@ -539,42 +500,35 @@
</div>
</div>
-
<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
- failure. A failure infers that you should retry the download.
+ 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>
-
<p>- To use md5sum, type: [sam@localhost]$ <strong class="userinput"><code>md5sum
path/to/the/image/file.iso</code></strong>.
</p>
-
<p>- To use sha1sum, type: [sam@localhost]$ <strong class="userinput"><code>sha1sum
path/to/the/image/file.iso</code></strong>.
</p>
-
<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>
-
-
<p></p>
</div>
</div>
-
<div class="section" title="Burn or dump the ISO">
<div class="titlepage">
@@ -586,13 +540,11 @@
</div>
</div>
-
<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
+ stick. These operations are not a simple copy and aim to make a bootable
medium.
</p>
-
<div class="section" title="Burning the ISO to a CD/DVD">
<div class="titlepage">
@@ -604,7 +556,6 @@
</div>
</div>
-
<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
@@ -613,7 +564,6 @@
</p>
</div>
-
<div class="section" title="Odlaganje odtisa nosilca za namestitev na klju&#269;ek USB">
<div class="titlepage">
@@ -625,12 +575,10 @@
</div>
</div>
-
<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>
-
<div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -650,12 +598,10 @@
</tr>
</table>
</div>
-
<p>To recover the original capacity, you must redo partitioning and re-format
the USB stick.
</p>
-
<div class="section" title="Using a graphical tool within Mageia">
<div class="titlepage">
@@ -667,12 +613,10 @@
</div>
</div>
-
<p>Uporabite lahko orodje z grafi&#269;nim vmesnikom kot je <a class="ulink" href="https://wiki.mageia.org/en/IsoDumper_Writing_ISO_images_on_USB_sticks" target="_top">IsoDumper</a></p>
</div>
-
<div class="section" title="Using a graphical tool within Windows">
<div class="titlepage">
@@ -684,21 +628,17 @@
</div>
</div>
-
<p>Lahko poskusite:</p>
-
<p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=sl" target="_top">Rufus</a> z uporabo
mo&#382;nosti "ISO image" "ISO slika" ;
</p>
-
<p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32
Disk Imager</a></p>
</div>
-
<div class="section" title="Using Command line within a GNU/Linux system">
<div class="titlepage">
@@ -710,7 +650,6 @@
</div>
</div>
-
<div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -729,10 +668,8 @@
</tr>
</table>
</div>
-
<p>You can also use the dd tool in a console:</p>
-
<div class="orderedlist">
<ol class="orderedlist" type="1">
@@ -746,13 +683,12 @@
<p>Become root with the command <strong class="userinput"><code>su -</code></strong> (don't forget the
final '-' )
</p>
-
</li>
<li class="listitem">
- <p>Plug your USB stick (do not mount it, this also means do not open any
+ <p>Plug in your USB stick (do not mount it, this also means do not open any
application or file manager that could access or read it)
</p>
@@ -760,15 +696,12 @@
<li class="listitem">
<p>Enter the command <strong class="userinput"><code>fdisk -l</code></strong></p>
-
-
<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>
-
<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
@@ -799,10 +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>
-
<p>Where X=your device name eg: /dev/sdc</p>
-
<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/sl/acceptLicense.html b/sl/acceptLicense.html
index 1adaadf..eba7072 100644
--- a/sl/acceptLicense.html
+++ b/sl/acceptLicense.html
@@ -99,9 +99,9 @@
- <p>Important information are given about this release of
- <span class="application">Mageia</span> and are accessible clicking on the
- <span class="guibutton">Release Notes</span> button.
+ <p>Za to izdajo distribucije <span class="application">Mageia</span> so na voljo
+ pomembne informacije, dosegljive s klikom na gumb <span class="guibutton">Opombe ob
+ izdaji</span>.
</p>
</div>
diff --git a/sl/addUser.html b/sl/addUser.html
index 3f07c73..8abcb79 100644
--- a/sl/addUser.html
+++ b/sl/addUser.html
@@ -23,11 +23,8 @@
</div>
</div>
-
-
-
<div class="section" title="Nastavite geslo skrbnika (uporabnika root):">
<div class="titlepage">
@@ -39,18 +36,14 @@
</div>
</div>
-
- <p>It is advisable for all <span class="application">Mageia</span> installations to
- set a superuser or administrator's password, usually called the
- <span class="emphasis"><em>root password</em></span> in Linux. As you type a password into the
- top box the colour of its shield will change from red to yellow to green
- depending on the strength of the password. A green shield shows you are
- using a strong password. You need to repeat the same password in the box
- just below the first password box, this checks that you have not mistyped
- the first password by comparing them.
+ <p>V vseh namestitvah <span class="application">Mageje</span> je priporo&#269;ljivo
+ nastaviti geslo skrbnika, v Linux-u znan kot <span class="emphasis"><em>geslo root
+ uporabnika</em></span>. Med tipkanjem gesla v polje se bo barva &#353;&#269;ita
+ spremenila glede na mo&#269; gesla od rde&#269;e do rumene in pri mo&#269;nem geslu
+ zelene. Zaradi preverjanja pravilnosti vnosa morate geslo ponoviti v polju
+ ni&#382;e.
</p>
-
<div class="note" title="Opomba" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -61,8 +54,8 @@
<tr>
<td align="left" valign="top">
- <p>All passwords are case sensitive, it is best to use a mixture of letters
- (upper and lower case), numbers and other characters in a password.
+ <p>Vsa gesla so ob&#269;utljiva na velikost &#269;rk. Najbolje je v njem uporabiti
+ me&#353;anico velikih ter malih &#269;rk, &#353;tevilk in posebnih znakov.
</p>
</td>
@@ -71,7 +64,6 @@
</div>
</div>
-
<div class="section" title="Dodajte uporabnika">
<div class="titlepage">
@@ -83,56 +75,51 @@
</div>
</div>
-
- <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>Tukaj dodajte uporabnika. Imel bo manj pravic kot skrbnik (root), a dovolj
+ za uporabo spleta, pisarni&#353;kih programov, igranje iger in vse ostalo kar
+ obi&#269;ajni uporabnik po&#269;ne z ra&#269;unalnikom.
</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p><span class="guibutton">Icon</span>: if you click on this button it will change the
- users icon.
+ <p><span class="guibutton">Ikona</span>: s klikom na ta gumb je mo&#382;no spremeniti ikono
+ oz. sliko uporabnika.
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">Real Name</span>: Insert the users real name into this text
- box.
+ <p><span class="guilabel">Pravo ime</span>: tukaj vnesite pravo ime uporabnika.
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">Login Name</span>: Here you enter the user login name or let
- drakx use a version of the users real name. <span class="emphasis"><em>The login name is case
- sensitive.</em></span></p>
+ <p><span class="guilabel">Prijavno ime</span>: Tukaj vnesete prijavno ime uporabnika ali
+ pustite programu drakx uporabiti verzijo pravega imena
+ uporabnika. <span class="emphasis"><em>Prijavno ime razlikuje med velikostjo &#269;rk.</em></span></p>
</li>
<li class="listitem">
- <p><span class="guilabel">Password</span>: In this text box you should type in the user
- password. There is a shield at the end of the text box that indicates the
- strength of the password. (See also <a class="xref" href="addUser.html#givePassword" title="Opomba">Opomba</a>)
+ <p><span class="guilabel">Geslo</span>: Tukaj vnesite uporabni&#353;ko geslo. Med tipkanjem
+ gesla v polje se bo barva &#353;&#269;ita desno spremenila glede na mo&#269; gesla od rde&#269;e
+ do rumene in pri mo&#269;nem geslu zelene. (Glejte tudi <a class="xref" href="addUser.html#givePassword" title="Opomba">Opomba</a>)
</p>
</li>
<li class="listitem">
- <p><span class="guilabel">Password (again)</span>: Retype the user password into this
- text box and drakx will check you have the same password in each of the user
- password text boxes.
+ <p><span class="guilabel">Geslo (ponovno)</span>: Program drakx preverja pravilnost
+ vnosa, zato morate vnos gesla ponoviti.
</p>
</li>
</ul>
</div>
-
<div class="note" title="Opomba" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -143,16 +130,14 @@
<tr>
<td align="left" valign="top">
- <p>Any user you add while installing Mageia, will have a both read and write
- protected home directory (umask=0027).
+ <p>Vsak uporabnik, dodan med namestitvijo Mageje, bo imel doma&#269;o mapo za&#353;&#269;iteno
+ tako pred branjem kot tudi pisanjem (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>Ve&#269; uporabnikov je med namestitvijo mo&#382;no dodati v koraku
+ <span class="emphasis"><em>Nastavitve - povzetek</em></span>. Izberite <span class="emphasis"><em>Upravljanje
+ uporabnikov</em></span>.
</p>
-
<p>Dovoljenje dostopa lahko spremenite tudi po namestitvi</p>
@@ -162,7 +147,6 @@
</div>
</div>
-
<div class="section" title="Napredno upravljanje z uporabniki">
<div class="titlepage">
@@ -174,15 +158,12 @@
</div>
</div>
-
- <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>S klikom na gumb <span class="guibutton">Napredno</span> lahko urejate nastavitev za
+ tega dodanega uporabnika.
</p>
-
<p>Dodatno lahko onemogo&#269;ite ali omogo&#269;ite prijavo gosta.</p>
-
<div class="warning" title="Pozor" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -202,7 +183,6 @@
</tr>
</table>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
diff --git a/sl/add_supplemental_media.html b/sl/add_supplemental_media.html
index 5cc9102..d6c2728 100644
--- a/sl/add_supplemental_media.html
+++ b/sl/add_supplemental_media.html
@@ -31,30 +31,29 @@
- <p>This screen gives you the list of already recognized repositories. You can
- add other sources for packages, like an optical disc or a remote source. The
- source selection determines which packages will be available for selection
- during the next steps.
+ <p>Ta zaslon ponuja seznam &#382;e prepoznanih odlagali&#353;&#269; paketov. Lahko dodate &#353;e
+ kak drug vir, recimo DVD ali kak oddaljen vir. Ta izbor bo dolo&#269;il kateri
+ paketi bodo na voljo v naslednjih korakih.
</p>
- <p>For a network source, there are two steps to follow:</p>
+ <p>Za omre&#382;ni vir je potrebno slediti dvema korakoma:</p>
<div class="orderedlist">
<ol class="orderedlist" type="1">
<li class="listitem">
- <p>Choosing and activation of the network, if not already up. </p>
+ <p>Izbor in po potrebi aktiviranje omre&#382;ja. </p>
</li>
<li class="listitem">
- <p>Selecting a mirror or specifying a URL (very first entry). By selecting a
- mirror, you have access to the selection of all repositories managed by
- Mageia, like the Nonfree , the Tainted repositories and the Updates. With
- the URL, you can designate a specific repository or your own NFS
- installation.
+ <p>Izbor zrcala ali dolo&#269;anje URL-ja (&#269;isto prvi vnos). Z izborom zrcala
+ pridobite dostop do vseh skladi&#353;&#269;, ki jih upravlja skupnost Mageia, Npr. z
+ lastni&#353;ko programsko opremo (Nonfree) ali Patentno za&#353;&#269;iteni (Tainted) in
+ seveda posodobitve. Z dolo&#269;anjem URL-ja lahko dolo&#269;ite specifi&#269;no skladi&#353;&#269;e
+ ali va&#353;o lastno namestitev NFS.
</p>
</li>
@@ -71,12 +70,11 @@
<tr>
<td align="left" valign="top">
- <p>If you are updating a 64 bit installation which may contain some 32 bit
- packages, it is advised to use this screen to add an online mirror by
- ticking one of the Network protocols here. The 64 bit DVD iso only contains
- 64 bit and noarch packages, it will not be able to update the 32 bit
- packages. However, after adding an online mirror, installer will find the
- needed 32 bit packages there.
+ <p>Za posodobitev 64-bitne namestitve, ki lahko vsebuje nekaj 32-bitnih paketov
+ je priporo&#269;ljivo tukaj dodati aktivno zrcalo z ozna&#269;enjem enega od omre&#382;nih
+ protokolov. To je potrebno, ker 64-bitna slika odtisa diska ne vsebuje
+ 32-bitnih paketov, zato jih brez aktivnega zrcala namestitev ne more
+ posodobiti.
</p>
</td>
diff --git a/sl/doPartitionDisks.html b/sl/doPartitionDisks.html
index bb2fb28..03b2daf 100644
--- a/sl/doPartitionDisks.html
+++ b/sl/doPartitionDisks.html
@@ -42,8 +42,6 @@
-
-
<p><a name="doPartitionDisks-pa3"></a></p>
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -102,8 +100,6 @@
</p>
-
-
</li>
</ul>
@@ -243,8 +239,6 @@
-
-
</td>
</tr>
diff --git a/sl/index.html b/sl/index.html
index a71e513..64411ff 100644
--- a/sl/index.html
+++ b/sl/index.html
@@ -75,11 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">Glavne mo&#382;nosti zagonskega nalagalnika</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="setupBootloader.html#d5e900">Bootloader interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e930">Using a Mageia bootloader</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e947">Using an existing bootloader</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e950">Using the chain loading</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e967">Mo&#382;nosti</a></span></dt>
+ <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">Mo&#382;nosti</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">Add or Modify a Boot Menu Entry</a></span></dt>
@@ -113,7 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Odstrani Magejo</a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1273">Howto</a></span></dt>
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Howto</a></span></dt>
</dl>
</dd>
</dl>
diff --git a/sl/setupBootloader.html b/sl/setupBootloader.html
index e37442d..0c074a6 100644
--- a/sl/setupBootloader.html
+++ b/sl/setupBootloader.html
@@ -33,7 +33,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e900"></a>Bootloader interface
+ <h3 class="title"><a name="d5e886"></a>Bootloader interface
</h3>
</div>
</div>
@@ -81,7 +81,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e910"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
+ <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
</h4>
</div>
</div>
@@ -91,9 +91,7 @@
-
-
- <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
+ <p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
</div>
@@ -102,7 +100,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e919"></a>Grub2-efi on UEFI systems
+ <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
</h4>
</div>
</div>
@@ -117,19 +115,17 @@
-
-
- <p>If Mageia is the first system installed on your computer, the installer
+ <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 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 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.
+ (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 really knowing what you do.</p>
+ <p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
</div>
@@ -140,7 +136,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e930"></a>Using a Mageia bootloader
+ <h3 class="title"><a name="d5e910"></a>Using a Mageia bootloader
</h3>
</div>
</div>
@@ -175,8 +171,6 @@
<span class="guilabel">Probe Foreign OS</span></p>
-
-
</div>
@@ -185,7 +179,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e947"></a>Using an existing bootloader
+ <h3 class="title"><a name="d5e924"></a>Using an existing bootloader
</h3>
</div>
</div>
@@ -203,11 +197,11 @@
</div>
- <div class="section" title="Using the chain loading">
+ <div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e950"></a>Using the chain loading
+ <h3 class="title"><a name="d5e927"></a>Using chain loading
</h3>
</div>
</div>
@@ -215,7 +209,7 @@
- <p>If you don't want a bootable Mageia, but chain load it from another OS,
+ <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>.
@@ -224,10 +218,8 @@
-
-
- <p>You will get a warning that the bootloader will lack, ignore it by a click
- on <span class="guibutton">OK</span>.
+ <p>You will get a warning that the bootloader is missing, ignore it by clicking
+ <span class="guibutton">OK</span>.
</p>
@@ -239,7 +231,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e967"></a>Mo&#382;nosti
+ <h3 class="title"><a name="d5e941"></a>Mo&#382;nosti
</h3>
</div>
</div>
@@ -251,7 +243,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e969"></a>First page
+ <h4 class="title"><a name="d5e943"></a>First page
</h4>
</div>
</div>
@@ -302,10 +294,10 @@
<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. Uncheck it be
- useful, for example, if your computer does not support ACPI or if you think
- the ACPI implementation might cause some problems (for instance random
- reboots or system lockups).
+ 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>
@@ -328,7 +320,7 @@
<li class="listitem">
<p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
- manage all external interrupts for some specific processor in an SMP system.
+ manages all external interrupts for a specific processor in an SMP system.
</p>
</li>
@@ -346,7 +338,7 @@
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e1001"></a>Next page
+ <h4 class="title"><a name="d5e975"></a>Next page
</h4>
</div>
</div>
diff --git a/sl/uninstall-Mageia.html b/sl/uninstall-Mageia.html
index ad26c14..21abc94 100644
--- a/sl/uninstall-Mageia.html
+++ b/sl/uninstall-Mageia.html
@@ -31,7 +31,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e1273"></a>Howto
+ <h3 class="title"><a name="d5e1247"></a>Howto
</h3>
</div>
</div>
diff --git a/sq/Select-and-use-ISOs.html b/sq/Select-and-use-ISOs.html
index 84ff89f..5cfda8d 100644
--- a/sq/Select-and-use-ISOs.html
+++ b/sq/Select-and-use-ISOs.html
@@ -23,9 +23,7 @@
</div>
</div>
-
-
<div class="section" title="Paraqitje">
<div class="titlepage">
@@ -37,15 +35,12 @@
</div>
</div>
-
<p>Mageia is distributed via ISO images. This page will help you to choose
which image match your needs.
</p>
-
<p>There is two families of media:</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -68,12 +63,10 @@
</li>
</ul>
</div>
-
<p>Details are given in the next sections.</p>
</div>
-
<div class="section" title="Media">
<div class="titlepage">
@@ -85,7 +78,6 @@
</div>
</div>
-
<div class="section" title="P&euml;rcaktim">
<div class="titlepage">
@@ -97,19 +89,16 @@
</div>
</div>
-
<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>
-
<p>Ju mund ti gjeni <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">k&euml;tu</a>.
</p>
</div>
-
<div class="section" title="Classical installation media">
<div class="titlepage">
@@ -121,7 +110,6 @@
</div>
</div>
-
<div class="section" title="Common features">
<div class="titlepage">
@@ -133,7 +121,6 @@
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -149,29 +136,9 @@
</p>
</li>
- </ul>
- </div>
-
- </div>
-
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
<li class="listitem">
- <p>Different media for architecture 32 or 64 bits.</p>
+ <p>Different media for 32 or 64 bit architectures.</p>
</li>
<li class="listitem">
@@ -195,77 +162,30 @@
</div>
</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>Jo t&euml; gjitha gjuh&euml;t jan&euml; n&euml; dispozicion. (be, bg, ca, de, en, es, fr, it,
- mk, pl, pt, ru, sv, uk) T&Euml; KONTROLLOHEN!
- </p>
-
- </li>
- <li class="listitem">
-
- <p>p&euml;rmban programe jo t&euml; lir&euml;.</p>
-
- </li>
- </ul>
- </div>
-
- </div>
</div>
-
<div class="section" title="Live media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e67"></a>Live media
+ <h4 class="title"><a name="d5e53"></a>Live media
</h4>
</div>
</div>
</div>
-
<div class="section" title="Common features">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e69"></a>Common features
+ <h5 class="title"><a name="d5e55"></a>Common features
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -278,7 +198,7 @@
</li>
<li class="listitem">
- <p>Each ISO contains only one desktop environment (KDE or GNOME).</p>
+ <p>Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).</p>
</li>
<li class="listitem">
@@ -302,54 +222,50 @@
</div>
</div>
-
- <div class="section" title="Live CD KDE">
+ <div class="section" title="Live DVD Plasma">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e83"></a>Live CD KDE
+ <h5 class="title"><a name="d5e69"></a>Live DVD Plasma
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>KDE desktop environment only.</p>
+ <p>Plasma desktop environment only.</p>
</li>
<li class="listitem">
- <p>Vet&euml;m gjuha angleze.</p>
+ <p>T&euml; gjitha gjuh&euml;t jan&euml; t&euml; pranish&euml;me.</p>
</li>
<li class="listitem">
- <p>32 bit vet&euml;m.</p>
+ <p>64 bit architecture only.</p>
</li>
</ul>
</div>
</div>
-
- <div class="section" title="Live CD GNOME">
+ <div class="section" title="Live DVD GNOME">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e92"></a>Live CD GNOME
+ <h5 class="title"><a name="d5e78"></a>Live DVD GNOME
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -360,72 +276,35 @@
</li>
<li class="listitem">
- <p>Vet&euml;m gjuha angleze.</p>
-
- </li>
- <li class="listitem">
-
- <p>32 bit vet&euml;m.</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">
-
<p>T&euml; gjitha gjuh&euml;t jan&euml; t&euml; pranish&euml;me.</p>
</li>
<li class="listitem">
- <p>Different media for 32 or 64 bit architectures.</p>
+ <p>64 bit architecture only</p>
</li>
</ul>
</div>
</div>
-
- <div class="section" title="Live DVD GNOME">
+ <div class="section" title="Live DVD Xfce">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e110"></a>Live DVD GNOME
+ <h5 class="title"><a name="d5e87"></a>Live DVD Xfce
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>GNOME desktop environment only.</p>
+ <p>Xfce desktop environment only.</p>
</li>
<li class="listitem">
@@ -435,7 +314,7 @@
</li>
<li class="listitem">
- <p>Different media for 32 or 64 bit architectures.</p>
+ <p>32 or 64 bit architectures.</p>
</li>
</ul>
@@ -444,31 +323,28 @@
</div>
</div>
-
<div class="section" title="Boot-only CD media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e119"></a>Boot-only CD media
+ <h4 class="title"><a name="d5e96"></a>Boot-only CD media
</h4>
</div>
</div>
</div>
-
<div class="section" title="Common features">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e121"></a>Common features
+ <h5 class="title"><a name="d5e98"></a>Common features
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -504,25 +380,23 @@
</div>
</div>
-
- <div class="section" title="boot.iso">
+ <div class="section" title="netinstall.iso">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e132"></a>boot.iso
+ <h5 class="title"><a name="d5e109"></a>netinstall.iso
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
- <p>Contains only free software, for those people who refuse to use non-free
+ <p>Contains only free software, for those people who prefer not to use non-free
software.
</p>
@@ -531,19 +405,17 @@
</div>
</div>
-
- <div class="section" title="boot-nonfree.iso">
+ <div class="section" title="netinstall-nonfree.iso">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e137"></a>boot-nonfree.iso
+ <h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
</h5>
</div>
</div>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -562,131 +434,112 @@
</div>
</div>
-
<div class="section" title="Downloading and Checking Media">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e142"></a>Downloading and Checking Media
+ <h3 class="title"><a name="d5e119"></a>Downloading and Checking Media
</h3>
</div>
</div>
</div>
-
<div class="section" title="Shkarkim">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e144"></a>Shkarkim
+ <h4 class="title"><a name="d5e121"></a>Shkarkim
</h4>
</div>
</div>
</div>
-
- <p>Pasi t&euml; keni zgjedhur dosjen tuaj ISO, ju mund ta shkarkoni at&euml; duke
- p&euml;rdorur ose http ose BitTorrent. N&euml; t&euml; dyja rastet, nj&euml; dritare ju jep disa
- informacione, t&euml; tilla si pasqyr&euml; n&euml; p&euml;rdorim dhe mund&euml;sin&euml; p&euml;r t&euml; ndryshuar
- n&euml;se Shpejt&euml;sia &euml;sht&euml; i ul&euml;t. N&euml;se http &euml;sht&euml; zgjedhur, ju gjithashtu mund
- t&euml; shihni di&ccedil;ka si
+ <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 an opportunity to change if the bandwidth is to low. If
+ http is chosen, you may also see something like
</p>
-
-
<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:
+ usage</a>. Then a window similar to this one appears:
</p>
-
-
<p>Check the radio button Save File.</p>
</div>
-
- <div class="section" title="Checking the downloaded media integrity">
+ <div class="section" title="Checking the integrity of the downloaded media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e156"></a>Checking the downloaded media integrity
+ <h4 class="title"><a name="d5e133"></a>Checking the integrity of the downloaded media
</h4>
</div>
</div>
</div>
-
<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
- failure. A failure infers that you should retry the download.
+ 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>
-
<p>- To use md5sum, type: [sam@localhost]$ <strong class="userinput"><code>md5sum
path/to/the/image/file.iso</code></strong>.
</p>
-
<p>- To use sha1sum, type: [sam@localhost]$ <strong class="userinput"><code>sha1sum
path/to/the/image/file.iso</code></strong>.
</p>
-
<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>
-
-
<p></p>
</div>
</div>
-
<div class="section" title="Burn or dump the ISO">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e169"></a>Burn or dump the ISO
+ <h3 class="title"><a name="d5e146"></a>Burn or dump the ISO
</h3>
</div>
</div>
</div>
-
<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
+ stick. These operations are not a simple copy and aim to make a bootable
medium.
</p>
-
<div class="section" title="Burning the ISO to a CD/DVD">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e172"></a>Burning the ISO to a CD/DVD
+ <h4 class="title"><a name="d5e149"></a>Burning the ISO to a CD/DVD
</h4>
</div>
</div>
</div>
-
<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
@@ -695,24 +548,21 @@
</p>
</div>
-
<div class="section" title="Dump the ISO to a USB stick">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e177"></a>Dump the ISO to a USB stick
+ <h4 class="title"><a name="d5e154"></a>Dump the ISO to a USB stick
</h4>
</div>
</div>
</div>
-
<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>
-
<div class="warning" title="Paralajm&euml;rim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -723,7 +573,7 @@
<tr>
<td align="left" valign="top">
- <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
the device; any other data will be lost and the partition capacity will be
reduced to the image size.
</p>
@@ -732,67 +582,58 @@
</tr>
</table>
</div>
-
<p>To recover the original capacity, you must redo partitioning and re-format
the USB stick.
</p>
-
<div class="section" title="Using a graphical tool within Mageia">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e183"></a>Using a graphical tool within Mageia
+ <h5 class="title"><a name="d5e160"></a>Using a graphical tool within Mageia
</h5>
</div>
</div>
</div>
-
<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>
-
<div class="section" title="Using a graphical tool within Windows">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e187"></a>Using a graphical tool within Windows
+ <h5 class="title"><a name="d5e164"></a>Using a graphical tool within Windows
</h5>
</div>
</div>
</div>
-
<p>Ju mund t&euml; provoni:</p>
-
<p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> using the
"ISO image" option;
</p>
-
<p>- <a class="ulink" href="http://sourceforge.net/projects/win32diskimager" target="_top">Win32
Disk Imager</a></p>
</div>
-
<div class="section" title="Using Command line within a GNU/Linux system">
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e194"></a>Using Command line within a GNU/Linux system
+ <h5 class="title"><a name="d5e171"></a>Using Command line within a GNU/Linux system
</h5>
</div>
</div>
</div>
-
<div class="warning" title="Paralajm&euml;rim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -811,10 +652,8 @@
</tr>
</table>
</div>
-
<p>You can also use the dd tool in a console:</p>
-
<div class="orderedlist">
<ol class="orderedlist" type="1">
@@ -828,13 +667,12 @@
<p>B&euml;huni root me komand&euml;n <strong class="userinput"><code>su -</code></strong> (mos harroni '-' n&euml; fund
)
</p>
-
</li>
<li class="listitem">
- <p>Plug your USB stick (do not mount it, this also means do not open any
+ <p>Plug in your USB stick (do not mount it, this also means do not open any
application or file manager that could access or read it)
</p>
@@ -842,15 +680,12 @@
<li class="listitem">
<p>Shkruani komand&euml;n <strong class="userinput"><code>fdisk -l</code></strong></p>
-
-
<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>
-
<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
@@ -881,12 +716,10 @@
<p>Shkruani komand&euml;n: # <strong class="userinput"><code>dd if=path/to/the/ISO/file of=/dev/sdX
bs=1M</code></strong></p>
-
<p>Where X=your device name eg: /dev/sdc</p>
-
- <p>Shembull: # <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
+ <p>Example: # <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
of=/dev/sdb bs=1M</code></strong></p>
</li>
diff --git a/sq/addUser.html b/sq/addUser.html
index 03a5f48..4a14616 100644
--- a/sq/addUser.html
+++ b/sq/addUser.html
@@ -23,25 +23,8 @@
</div>
</div>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<div class="section" title="Vendos Fjal&euml;kalim administratori (root):">
<div class="titlepage">
@@ -53,7 +36,6 @@
</div>
</div>
-
<p>&Euml;sht&euml; e k&euml;shillueshme p&euml;r t&euml; gjith&euml; instalimet
<span class="application">Mageia</span> p&euml;r t&euml; vendosur nj&euml; superp&euml;rdorues apo
@@ -65,7 +47,6 @@
fjal&euml;kalim n&euml; kutin&euml; vet&euml;m n&euml;n kutin&euml; e par&euml; fjal&euml;kalimi, kjo kontrollon se
ju nuk e keni shtypur keq pyetjen fjal&euml;kalimin e par&euml; duke i krahasuar ato.
</p>
-
<div class="note" title="Sh&euml;nim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -87,7 +68,6 @@
</div>
</div>
-
<div class="section" title="Fut nj&euml; p&euml;rdorues">
<div class="titlepage">
@@ -99,14 +79,12 @@
</div>
</div>
-
<p>Shto nj&euml; p&euml;rdorues k&euml;tu. Nj&euml; p&euml;rdorues ka m&euml; pak t&euml; drejta se
super-p&euml;rdoruesit (root), por t&euml; mjaftueshme p&euml;r t&euml; shfletuar n&euml; internet,
p&euml;rdorimi aplikacioneve t&euml; zyr&euml;s ose luajn&euml; loj&euml;ra dhe &ccedil;do gj&euml; tjet&euml;r
p&euml;rdoruesi mesatar b&euml;n me kompjuterin e tij
</p>
-
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -149,7 +127,6 @@
</li>
</ul>
</div>
-
<div class="note" title="Sh&euml;nim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
@@ -160,29 +137,14 @@
<tr>
<td align="left" valign="top">
- <p>&Ccedil;do p&euml;rdorues ju shtoni gjat&euml; instalimit Mageia, do t&euml; ket&euml; nj&euml; bot&euml; t&euml;
- lexuesh&euml;m (por shkrim i mbrojtur) skedari sht&euml;pi.
+ <p>Any user you add while installing Mageia, will have a both read and write
+ protected home directory (umask=0027).
</p>
-
- <p>Megjithat&euml;, duke p&euml;rdorur instalmin tuaj t&euml; ri, &ccedil;do p&euml;rdorues q&euml; t&euml; shtoni
- n&euml; <span class="emphasis"><em>MCC - System - Menaxho p&euml;rdoruesit n&euml; sistem</em></span> do t&euml;
- ket&euml; nj&euml; skedar&euml; sht&euml;pi q&euml; &euml;sht&euml; me mbrojtje lexo dhe shkruaj.
+ <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>N&euml;se ju nuk doni nj&euml; skedar&euml; t&euml; p&euml;rgjithsh&euml;m t&euml; lexuesh&euml;m sht&euml;pi p&euml;r t&euml;
- gjith&euml;, &euml;sht&euml; k&euml;shilluar p&euml;r t&euml; shtuar vet&euml;m nj&euml; p&euml;rdorues t&euml; p&euml;rkohshme
- tani dhe p&euml;r t&euml; shtuar nj&euml; t&euml; v&euml;rtet&euml; pa(s) rinisjes.
- </p>
-
-
- <p>N&euml;se ju preferoni skedar&euml; t&euml; lexuesh&euml;m dokumente n&euml; sht&euml;pi, ju mund t&euml;
- d&euml;shironi t&euml; shtoni t&euml; gjith&euml; p&euml;rdoruesit shtes&euml; t&euml; nevojshme n&euml;
- <span class="emphasis"><em>Konfiguracion - P&euml;rmbledhje</em></span> hap gjat&euml;
- instalimit. Zgjidh <span class="emphasis"><em>Menaxhimi P&euml;rdoruesit</em></span>.
- </p>
-
<p>Lejet hyr&euml;se gjithashtu mund t&euml; ndryshohet pas instalimit.</p>
@@ -192,7 +154,6 @@
</div>
</div>
-
<div class="section" title="Menaxhim P&euml;rdoruesi Avancuar">
<div class="titlepage">
@@ -204,16 +165,13 @@
</div>
</div>
-
<p>N&euml;se butoni <span class="guibutton">avancimi</span> klikohet ju do ju ofrohet nj&euml;
ekran q&euml; ju lejon t&euml; modifikoni cil&euml;simet p&euml;r p&euml;rdoruesin q&euml; ju jeni duke
shtuar.
</p>
-
<p>P&euml;rve&ccedil; k&euml;saj, ju mund t&euml; &ccedil;aktivizoni ose aktivizo nj&euml; llogari mysafir.</p>
-
<div class="warning" title="Paralajm&euml;rim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -234,7 +192,6 @@
</tr>
</table>
</div>
-
<div class="itemizedlist">
<ul class="itemizedlist">
diff --git a/sq/chooseDesktop.html b/sq/chooseDesktop.html
index 184ba68..8713f53 100644
--- a/sq/chooseDesktop.html
+++ b/sq/chooseDesktop.html
@@ -22,29 +22,24 @@
</div>
</div>
</div>
+
-
-
-
-
-
+
-
+
<p>N&euml; var&euml;si t&euml; zgjedhjes tuaj k&euml;tu, ju mund t&euml; ju ofrohet ekran i m&euml;tejshme
p&euml;r t&euml; akorduar gjob&euml; zgjedhjes tuaj.
</p>
-
+
<p>Pas p&euml;rzgjedhjes hapave(s), ju do t&euml; shihni nj&euml; shfaqje gjat&euml; instalimit t&euml;
paket&euml;s. Shfaqje mund t&euml; &ccedil;'aktiviohet duke shtypur butonin
<span class="guilabel">Detajet</span></p>
+
-
-
-
-
+
<p>Zgjidhni n&euml;se ju preferoni t&euml; p&euml;rdorni <span class="application">KDE</span> ose
<span class="application">Gnome</span> mjedisin desktop. T&euml; dy vijn&euml; me nj&euml; seri
t&euml; plot&euml; t&euml; aplikacioneve t&euml; dobishme dhe mjetet. Shenj&euml;
@@ -54,7 +49,7 @@
desktop &euml;sht&euml; m&euml; e leht&euml; se dy t&euml; m&euml;parshmit, mb&euml;shtet karamele sy m&euml; pak
dhe m&euml; pak paketa instaluese nga parazgjedhja.
</p>
-
+
</div>
</body>
</html>
diff --git a/sq/choosePackageGroups.html b/sq/choosePackageGroups.html
index d5da924..64f2bec 100644
--- a/sq/choosePackageGroups.html
+++ b/sq/choosePackageGroups.html
@@ -22,14 +22,13 @@
</div>
</div>
</div>
+
-
-
-
-
+
+
-
+
<p>Paketat jan&euml; t&euml; renditura n&euml; grupe, p&euml;r t&euml; b&euml;r&euml; zgjedhjen atyre q&euml; ju duhet
n&euml; sistemin tuaj shum&euml; m&euml; e leht&euml;. Grupet jan&euml; mjaft t&euml; vet&euml; shpjeguesh&euml;m,
megjithat&euml; m&euml; shum&euml; informacion n&euml; lidhje me p&euml;rmbajtjen e secilit &euml;sht&euml; n&euml;
@@ -37,38 +36,39 @@
ta.
</p>
-
+
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-
- <p>Stacion-pune.</p>
+ <p>Stacion-pune.</p>
+
</li>
<li class="listitem">
-
- <p>Server.</p>
+ <p>Server.</p>
+
</li>
<li class="listitem">
-
- <p>Mjedis Grafike.</p>
+ <p>Mjedis Grafike.</p>
+
</li>
<li class="listitem">
-
+
<p>Zgjedhja Individuale Paketave: Ju mund t&euml; p&euml;rdorni k&euml;t&euml; opsion p&euml;r t&euml; shtuar
manualisht ose hequr paketa.
</p>
-
+
</li>
</ul>
</div>
-
- <p>Lexo <a class="xref" href="minimal-install.html" title="Instalim Minimal">seksioni i quajtur &#8220;Instalim Minimal&#8221;</a> p&euml;r instruksione si p&euml;r t&euml; b&euml;r&euml;
- nj&euml; instalim minimal (pa ose me X &amp; IceWM).
- </p>
+
+ <p>Read <a class="xref" href="minimal-install.html" title="Instalim Minimal">seksioni i quajtur &#8220;Instalim Minimal&#8221;</a> for instructions on how to do a
+ minimal install (without or with X &amp; IceWM).
+ </p>
+
</div>
</body>
</html>
diff --git a/sq/diskdrake.html b/sq/diskdrake.html
index f043f43..22c8904 100644
--- a/sq/diskdrake.html
+++ b/sq/diskdrake.html
@@ -29,18 +29,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
<div class="warning" title="Paralajm&euml;rim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -103,7 +91,7 @@
<td align="left" valign="top">
<p>If you are installing Mageia on an UEFI system, check that an ESP (EFI
- System Partition) is present and correctly mounted on /boot/EFI (see above)
+ System Partition) is present and correctly mounted on /boot/EFI (see below)
</p>
@@ -114,6 +102,27 @@
</table>
</div>
+
+ <div class="note" title="Sh&euml;nim" 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="[Sh&euml;nim]" 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>
+
</div>
</body>
</html>
diff --git a/sq/doPartitionDisks.html b/sq/doPartitionDisks.html
index baaafd0..903cbbd 100644
--- a/sq/doPartitionDisks.html
+++ b/sq/doPartitionDisks.html
@@ -225,6 +225,32 @@
</div>
+ <div class="note" title="Sh&euml;nim" 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="[Sh&euml;nim]" 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>
+
+
<div class="warning" title="Paralajm&euml;rim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
diff --git a/sq/exitInstall.html b/sq/exitInstall.html
index 46e0389..eba9798 100644
--- a/sq/exitInstall.html
+++ b/sq/exitInstall.html
@@ -24,14 +24,9 @@
</div>
-
-
-
-
-
+
-
<p><a name="exitInstall-pa1"></a>Ju keni p&euml;rfunduar instalimin dhe konfigurimin
@@ -46,19 +41,17 @@
<p><a name="exitInstall-pa3"></a>N&euml;se ju nuk e keni t&euml; rregulluar parametrat p&euml;r ngarkuesin-ndez&euml;s, instalimi
- juaj Mageia do t&euml; p&euml;rzgjidhet automatikisht dhe filloi.
+ juaj Mageia do t&euml; p&euml;rzgjidhet automatikisht dhe filloi.
</p>
-
+
<p><a name="exitInstall-pa4"></a>K&euml;naquni!
</p>
-
+
<p><a name="exitInstall-pa5"></a>Vizito www.mageia.org n&euml;se keni ndonj&euml; pyetje ose d&euml;shironi t&euml; kontribuoni
- n&euml; Mageia
+ n&euml; Mageia
</p>
-
-
</div>
</body>
diff --git a/sq/index.html b/sq/index.html
index 3487249..16c9bf6 100644
--- a/sq/index.html
+++ b/sq/index.html
@@ -28,8 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Paraqitje</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Media</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>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Downloading and Checking Media</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">Burn or dump the ISO</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, instaluesi Mageia</a></span></dt>
@@ -75,17 +75,14 @@
<dt><span class="section"><a href="setupBootloader.html">Opsionet kryesore t&euml; programit Bootloader</a></span></dt>
<dd>
<dl>
- <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>
+ <dt><span class="section"><a href="setupBootloader.html#d5e883">Bootloader interface</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e907">Using a Mageia bootloader</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e921">Using an existing bootloader</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e924">Using chain loading</a></span></dt>
+ <dt><span class="section"><a href="setupBootloader.html#d5e938">Options</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>
<dt><span class="section"><a href="misc-params.html">Summary of miscellaneous parameters</a></span></dt>
<dd>
<dl>
@@ -116,7 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">&Ccedil;'instalim Mageia </a></span></dt>
<dd>
<dl>
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1206">Sit&euml;</a></span></dt>
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">Sit&euml;</a></span></dt>
</dl>
</dd>
</dl>
diff --git a/sq/misc-params.html b/sq/misc-params.html
index 89cb3cf..58839ff 100644
--- a/sq/misc-params.html
+++ b/sq/misc-params.html
@@ -29,28 +29,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<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 +36,44 @@
</p>
+ <div class="note" title="Sh&euml;nim" 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="[Sh&euml;nim]" 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>
+
+
<div class="section" title="Parametrat e Sistemit">
<div class="titlepage">
<div>
@@ -99,8 +115,7 @@
</p>
- <p><a name="misc-params-system-pa4b"></a>Mos ndrysho asgj&euml;, n&euml;se nuk keni njohuri se si t&euml; konfiguroni Grub dhe/ose
- Lilo
+ <p><a name="misc-params-system-pa4b"></a>Do not change anything, unless you know how to configure Grub2
</p>
@@ -165,6 +180,25 @@
<p><a name="misc-params-hardware-pa1a"></a>Kjo &euml;sht&euml; ajo ku ju vendosni ose ndryshoni paraqitjen e tastier&euml;s tuaj e
cila do t&euml; varet nga vendndodhja juaj, gjuha ose lloji i tastier&euml;s.
</p>
+
+
+ <div class="note" title="Sh&euml;nim" 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="[Sh&euml;nim]" 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>
</li>
<li class="listitem">
@@ -183,7 +217,7 @@
<p><a name="misc-params-hardware-pa3"></a><span class="guilabel">Karta Z&euml;rit</span>:
</p>
-
+
<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.
@@ -322,7 +356,8 @@
<p><a name="misc-params-security-pa2b"></a>Select the services that you wish to have access to your system. Your
- selections will depend on what you use your computer for.
+ selections will depend on what you use your computer for. For more
+ information, see <a class="xref" href="">???</a>.
</p>
diff --git a/sq/selectCountry.html b/sq/selectCountry.html
index 3fb9f5a..1d2c02d 100644
--- a/sq/selectCountry.html
+++ b/sq/selectCountry.html
@@ -22,30 +22,24 @@
</div>
</div>
</div>
+
+
+
-
-
-
-
-
-
-
-
-
- <p><a name="selectCountry-pa1"></a>Zgjidhni vendin tuaj ose rajonin. Kjo &euml;sht&euml; e r&euml;nd&euml;sishme p&euml;r t&euml; gjitha
- llojet e cil&euml;simeve, si monedhe dhe domain pa tel rregullator. Vendosja n&euml;
- vend t&euml; gabuar mund t&euml; &ccedil;oj&euml; n&euml; mos qen&euml; n&euml; gjendje p&euml;r t&euml; p&euml;rdorur nj&euml; rrjet
- Wireless.
+
+ <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
+ like the currency and wireless regulatory domain. Setting the wrong country
+ can lead to not being able to use a Wireless network.
</p>
-
+
<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>
-
+
<div class="note" title="Sh&euml;nim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -54,19 +48,19 @@
</tr>
<tr>
<td align="left" valign="top">
-
+
<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>
-
+
</td>
</tr>
</table>
</div>
-
+
<div class="section" title="Metod&euml; hyr&euml;se">
<div class="titlepage">
<div>
@@ -76,21 +70,19 @@
</div>
</div>
</div>
+
-
-
-
+
<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.
+ 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>
-
+
<div class="note" title="Sh&euml;nim" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Note">
<tr>
@@ -99,19 +91,19 @@
</tr>
<tr>
<td align="left" valign="top">
-
+
<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>
-
+
</td>
</tr>
</table>
</div>
-
+
</div>
-
+
</div>
</body>
</html>
diff --git a/sq/setupBootloader.html b/sq/setupBootloader.html
index 44672f5..f39fcbf 100644
--- a/sq/setupBootloader.html
+++ b/sq/setupBootloader.html
@@ -29,13 +29,11 @@
-
-
- <div class="section" title="With a Bios system">
+ <div class="section" title="Bootloader interface">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e899"></a>With a Bios system
+ <h3 class="title"><a name="d5e883"></a>Bootloader interface
</h3>
</div>
</div>
@@ -43,15 +41,23 @@
- <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>By default, Mageia uses exclusively:</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>
+ <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>
<div class="tip" title="Propozim" style="margin-left: 0.5in; margin-right: 0.5in;">
@@ -63,7 +69,7 @@
<tr>
<td align="left" valign="top">
- <p>The Mageia graphical menus are nice :</p>
+ <p>The Mageia graphical menus are nice :)</p>
</td>
</tr>
@@ -71,11 +77,11 @@
</div>
- <div class="section" title="Using a Mageia bootloader">
+ <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="usingMageiaBootloader"></a>Using a Mageia bootloader
+ <h4 class="title"><a name="d5e893"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
</h4>
</div>
</div>
@@ -83,50 +89,18 @@
- <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="Paralajm&euml;rim" 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="[Paralajm&euml;rim]" 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>
+ <p>Don't modify the "Boot Device" unless you really know what you are doing.</p>
</div>
- <div class="section" title="Using an existing bootloader">
+ <div class="section" title="Grub2-efi on UEFI systems">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="usingExistingBootloader"></a>Using an existing bootloader
+ <h4 class="title"><a name="d5e899"></a>Grub2-efi on UEFI systems
</h4>
</div>
</div>
@@ -134,81 +108,100 @@
- <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>With an UEFI system, the user interface is slightly different as you cannot
+ choose between with or without graphical menu
</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>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>
- <div class="tip" title="Propozim" 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="[Propozim]" 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>
+ <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="d5e907"></a>Using a Mageia bootloader
+ </h3>
+ </div>
+ </div>
+ </div>
+
- <div class="section" title="Bootloader advanced option">
- <div class="titlepage">
+ <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>
- <div>
- <h4 class="title"><a name="advancedOptionBootloader"></a>Bootloader advanced option
- </h4>
- </div>
+ <h3 class="title"><a name="d5e921"></a>Using an existing bootloader
+ </h3>
</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>
+
+
+
+ <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>
</div>
- <div class="section" title="With an UEFI system">
+ <div class="section" title="Using chain loading">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e936"></a>With an UEFI system
+ <h3 class="title"><a name="d5e924"></a>Using chain loading
</h3>
</div>
</div>
@@ -216,24 +209,190 @@
- <p>With an UEFI system, the user interface is slightly different as you cannot
- choose the boot loader since only Grub2-efi is available.
+ <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>
- <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>You will get a warning that the bootloader is missing, ignore it by clicking
+ <span class="guibutton">OK</span>.
</p>
- <p>Don't modify the "Boot Device" unless really knowing what you do.</p>
+
+ </div>
+
+
+ <div class="section" title="Options">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e938"></a>Options
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <div class="section" title="First page">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h4 class="title"><a name="d5e940"></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 a username and password will be asked at the boot
+ time to select a booting entry or change settings. The username is "root"
+ and the password is the one chosen here after.
+ </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="d5e972"></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>
</div>
diff --git a/sq/setupBootloaderAddEntry.html b/sq/setupBootloaderAddEntry.html
index 0f57ecd..f3d4fa9 100644
--- a/sq/setupBootloaderAddEntry.html
+++ b/sq/setupBootloaderAddEntry.html
@@ -27,110 +27,25 @@
+ <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="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="Sh&euml;nim" 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="[Sh&euml;nim]" 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="Paralajm&euml;rim" 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="[Paralajm&euml;rim]" 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>
-
-
-
+ <div class="note" title="Sh&euml;nim" 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="[Sh&euml;nim]" 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>
</div>
diff --git a/sq/soundConfig.html b/sq/soundConfig.html
index d8a09d0..9722aa2 100644
--- a/sq/soundConfig.html
+++ b/sq/soundConfig.html
@@ -22,7 +22,6 @@
</div>
</div>
</div>
-
@@ -33,22 +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.
-
</p>
+
<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.
-
</p>
+
<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.
-
</p>
@@ -67,15 +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.
-
</p>
<p>In that case you can select a different driver after clicking on
<span class="guibutton">Let me pick any driver</span>.
-
</p>
-
</div>
diff --git a/sq/uninstall-Mageia.html b/sq/uninstall-Mageia.html
index 1bd1bbb..fae4c46 100644
--- a/sq/uninstall-Mageia.html
+++ b/sq/uninstall-Mageia.html
@@ -31,7 +31,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e1206"></a>Sit&euml;
+ <h3 class="title"><a name="d5e1244"></a>Sit&euml;
</h3>
</div>
</div>
diff --git a/tr/Select-and-use-ISOs.html b/tr/Select-and-use-ISOs.html
index a516471..a02d22f 100644
--- a/tr/Select-and-use-ISOs.html
+++ b/tr/Select-and-use-ISOs.html
@@ -136,27 +136,6 @@
<p>&Ouml;nceki s&uuml;r&uuml;mden y&uuml;kseltme veya temiz bir kurulum yapabilirler.</p>
</li>
-<<<<<<< HEAD
-=======
- </ul>
- </div>
-
- </div>
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
@@ -192,11 +171,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>Canl&#305; Ortam
-=======
- <h4 class="title"><a name="d5e56"></a>Canl&#305; Ortam
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -207,11 +182,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>Ortak &ouml;zellikler
-=======
- <h5 class="title"><a name="d5e58"></a>Ortak &ouml;zellikler
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -229,11 +200,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Her bir ISO yaln&#305;z bir masa&uuml;st&uuml; ortam&#305; i&ccedil;erir (Plasma, Gnome veya Xfce).</p>
-=======
- <p>Her bir ISO yaln&#305;z bir masa&uuml;st&uuml; ortam&#305; i&ccedil;erir (KDE, Gnome veya Xfce).</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -262,11 +229,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>Canl&#305; DVD Plasma
-=======
- <h5 class="title"><a name="d5e72"></a>Canl&#305; DVD Plasma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -287,11 +250,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Sadece 64 bit mimari.</p>
-=======
- <p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -303,11 +262,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>Canl&#305; DVD GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>Canl&#305; DVD GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -340,11 +295,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>Canl&#305; DVD Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>Canl&#305; DVD Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -379,11 +330,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>Boot-only CD ortam&#305;
-=======
- <h4 class="title"><a name="d5e99"></a>Boot-only CD ortam&#305;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -394,11 +341,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>Ortak &ouml;zellikler
-=======
- <h5 class="title"><a name="d5e101"></a>Ortak &ouml;zellikler
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -442,11 +385,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -471,11 +410,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -504,11 +439,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>Ortamlar&#305; indirme ve kontrol etme
-=======
- <h3 class="title"><a name="d5e122"></a>Ortamlar&#305; indirme ve kontrol etme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -519,11 +450,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>&#304;ndirme
-=======
- <h4 class="title"><a name="d5e124"></a>&#304;ndirme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -551,18 +478,13 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>&#304;ndirilen ortam&#305;n b&uuml;t&uuml;nl&uuml;&#287;&uuml;n&uuml; kontrol etme
-=======
- <h4 class="title"><a name="d5e136"></a>&#304;ndirilen ortam&#305;n b&uuml;t&uuml;nl&uuml;&#287;&uuml;n&uuml; kontrol etme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
</div>
-<<<<<<< HEAD
<p>Her sa&#287;lama toplam&#305;, indirilecek dosyadan bir algoritma taraf&#305;ndan
hesaplanan onalt&#305;l&#305;k say&#305;lardan olu&#351;ur. Bu algoritmalara indirdi&#287;iniz
dosyadan bu say&#305;y&#305; yeniden hesaplamas&#305;n&#305; istedi&#287;inizde ya ayn&#305; rakam&#305;
@@ -570,14 +492,6 @@
dosyan&#305;n bozuk olmas&#305; nedeniyle farkl&#305; bir rakam bulacak ve hata
verecektir. Bir hata, ya dosyay&#305; yeniden indirmeniz gerekti&#287;i veya
BitTorrent kullanarak onarman&#305;z gerekti&#287;i anlam&#305;na gelmektedir.
-=======
- <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
- failure. A failure infers that you should retry the download or attempt a
- repair using BitTorrent.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Konsolu a&ccedil;&#305;n -root olman&#305;za gerek yok- ve a&#351;a&#287;&#305;daki komutlardan birini
@@ -607,11 +521,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>ISO yakma veya atma
-=======
- <h3 class="title"><a name="d5e149"></a>ISO yakma veya atma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -627,11 +537,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>Bir CD/DVD &uuml;zerine ISO yakma
-=======
- <h4 class="title"><a name="d5e152"></a>Bir CD/DVD &uuml;zerine ISO yakma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -651,11 +557,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>Bir USB bellek &uuml;zerine ISO atmak
-=======
- <h4 class="title"><a name="d5e157"></a>Bir USB bellek &uuml;zerine ISO atmak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -693,11 +595,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Mageia &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
-=======
- <h5 class="title"><a name="d5e163"></a>Mageia &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -714,11 +612,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Windows &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
-=======
- <h5 class="title"><a name="d5e167"></a>Windows &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -740,11 +634,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>Bir GNU/Linux sistem &uuml;zerinde komut sat&#305;r&#305;n&#305; kullanarak
-=======
- <h5 class="title"><a name="d5e174"></a>Bir GNU/Linux sistem &uuml;zerinde komut sat&#305;r&#305;n&#305; kullanarak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/tr/index.html b/tr/index.html
index 2268ca6..4d7a00a 100644
--- a/tr/index.html
+++ b/tr/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Giri&#351;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Ortam</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Ortamlar&#305; indirme ve kontrol etme</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">ISO yakma veya atma</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Ortamlar&#305; indirme ve kontrol etme</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">ISO yakma veya atma</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, Mageia Kurulum Arac&#305;</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">&Ouml;ny&uuml;kleyici ana se&ccedil;enekleri</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e883">&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e907">Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e921">Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e924">Zincirleme y&uuml;kleme kullan&#305;l&#305;yor</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e938">Se&ccedil;enekler</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e910">Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e924">Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak</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">Se&ccedil;enekler</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">&Ouml;ny&uuml;kleme Men&uuml; Girdisi Ekleme veya De&#287;i&#351;tirme</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Mageia' y&#305; Kald&#305;rma</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Nas&#305;l</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Nas&#305;l</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/tr/selectCountry.html b/tr/selectCountry.html
index e2a35b0..7f54abb 100644
--- a/tr/selectCountry.html
+++ b/tr/selectCountry.html
@@ -29,15 +29,9 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa1"></a>Bulundu&#287;unuz &uuml;lke veya b&ouml;lgeyi se&ccedil;in. Bu i&#351;lem, para birimi ve kablosuz a&#287;
dola&#351;&#305;m alan&#305; gibi her t&uuml;r ayar i&ccedil;in &ouml;nemlidir. Yanl&#305;&#351; &uuml;lkeyi se&ccedil;mek
Kablosuz a&#287; kullan&#305;m&#305;n&#305;z&#305; engelleyebilir.
-=======
- <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
- like the currency and wireless regulatory domain. Setting the wrong country
- can lead to not being able to use a Wireless network.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -79,22 +73,12 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa4"></a><span class="guilabel">Di&#287;er &Uuml;lkeler</span> ekran&#305;nda ayr&#305;ca bir girdi y&ouml;ntemi
(listenin sonunda) se&ccedil;ebilirsiniz. Girdi y&ouml;ntemleri kullan&#305;c&#305;lar&#305;n birden
&ccedil;ok alfabe karakterini (&Ccedil;ince, Japonca, Korece v.b.) kullanmalar&#305;n&#305;
sa&#287;lar. IBus &ouml;n tan&#305;ml&#305; girdi y&ouml;ntemidir. Di&#287;er girdi y&ouml;ntemleri de (SCIM,
GCIN, HIME vb.) benzer i&#351;levler sunar ve paket se&ccedil;iminden &ouml;nce HTTP/FTP veri
kayna&#287;&#305; ayarlanm&#305;&#351;sa kurulabilirler.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -107,16 +91,10 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p><a name="selectCountry-pa5"></a>Kurulum s&#305;ras&#305;nda girdi y&ouml;ntemi kurulumunu atlam&#305;&#351;san&#305;z; bu i&#351;leve,
kurdu&#287;unuz sistemi ba&#351;latt&#305;ktan sonra "Bilgisayar&#305;n&#305;z&#305; Yap&#305;land&#305;r&#305;n" -&gt;
"Sistem" yoluyla veya k&ouml;k olarak localedrake arac&#305;n&#305; &ccedil;al&#305;&#351;t&#305;rarak
eri&#351;ebilirsiniz.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</td>
diff --git a/tr/setupBootloader.html b/tr/setupBootloader.html
index defb765..5cc2edd 100644
--- a/tr/setupBootloader.html
+++ b/tr/setupBootloader.html
@@ -29,19 +29,11 @@
-<<<<<<< HEAD
<div class="section" title="&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e883"></a>&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;
-=======
- <div class="section" title="Bootloader interface">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e886"></a>Bootloader interface
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -49,31 +41,19 @@
-<<<<<<< HEAD
<p>&Ouml;ntan&#305;ml&#305; olarak Mageia sadece &#351;unu kullan&#305;r:</p>
-=======
- <p>By default, Mageia uses exclusively:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Eski/MBR veya Eski/GPT sistem i&ccedil;in Grub2 (grafiksel men&uuml; ile/olmadan) </p>
-=======
- <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Bir UEFI sistem i&ccedil;in Grub2-efi</p>
-=======
- <p>Grub2-efi for a UEFI system.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -97,19 +77,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Eski/MBR ve Eski/GPT sistemler &uuml;zerinde Grub2">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e893"></a>Eski/MBR ve Eski/GPT sistemler &uuml;zerinde Grub2
-=======
- <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
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -126,19 +98,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="UEFI sistemler &uuml;zerinde Grub2-efi">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e899"></a>UEFI sistemler &uuml;zerinde Grub2-efi
-=======
- <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
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -146,19 +110,13 @@
-<<<<<<< HEAD
<p>Bir UEFI sistemde kullan&#305;c&#305; aray&uuml;z&uuml; biraz farkl&#305;d&#305;r &ccedil;&uuml;nk&uuml; grafiksel men&uuml;n&uuml;n
bulunmas&#305; veya bulunmamas&#305; aras&#305;nda tercihte bulunamazs&#305;n&#305;z
-=======
- <p>With an UEFI system, the user interface is slightly different as you cannot
- choose between with or without graphical menu
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>Mageia bilgisayar&#305;n&#305;za kurdu&#287;unuz tek sistemse, kurulum arac&#305; &ouml;ny&uuml;kleyiciyi
(Grub2-efi) ta&#351;&#305;mak &uuml;zere bir ESP (EFI Sistem Disk B&ouml;l&uuml;m&uuml;)
olu&#351;turacakt&#305;r. Bilgisayar&#305;n&#305;zda &ouml;nceden bir UEFI i&#351;letim sistemi (Mesela
@@ -166,15 +124,6 @@
olan mevcut ESP alan&#305;n&#305; alg&#305;layarak grub2-efi'yi ekleyecektir. Birden fazla
ESP' nin bir arada olmas&#305; m&uuml;mk&uuml;n ise de sadece bir tane olmas&#305; &ouml;nerilir;
&ccedil;&uuml;nk&uuml; ka&ccedil; i&#351;letim sistemi kurulu olursa olsun biri yeterlidir.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -191,11 +140,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e907"></a>Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak
-=======
- <h3 class="title"><a name="d5e910"></a>Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -203,54 +148,34 @@
-<<<<<<< HEAD
<p>&Ouml;ntan&#305;ml&#305; olarak, sisteminize uygun bi&ccedil;imde Mageia &#351;unlardan birini yeni
olarak yazar:
</p>
-=======
- <p>By default, according to your system, Mageia writes a new:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Ya ilk sabit diskinizdeki MBR (Birincil &Ouml;ny&uuml;kleme Kayd&#305;) i&ccedil;ine veya BIOS
disk b&ouml;l&uuml;m&uuml;ne GRUB2 &ouml;ny&uuml;kleyicisi
-=======
- <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
- drive or in the BIOS boot partition.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>ESP i&ccedil;ine Grub2-efi &ouml;ny&uuml;kleyicisi</p>
-=======
- <p>Grub2-efi bootloader into the ESP</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
</div>
-<<<<<<< HEAD
<p>Zaten bir i&#351;letim sistemi kuruluysa, Mageia bunlar&#305; yeni Mageia &ouml;ny&uuml;kleme
men&uuml;n&uuml;ze eklemeyi dener. Bu davran&#305;&#351;&#305; istemiyorsan&#305;z
<span class="guibutton">&#304;leri</span> d&uuml;&#287;mesine t&#305;klay&#305;p <span class="guilabel">Yabanc&#305; &#304;&#351;letim
Sistemini Sorgula</span> kutucu&#287;undaki i&#351;areti kald&#305;r&#305;n.
</p>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -261,11 +186,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e921"></a>Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak
-=======
- <h3 class="title"><a name="d5e924"></a>Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -283,19 +204,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Zincirleme y&uuml;kleme kullan&#305;l&#305;yor">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e924"></a>Zincirleme y&uuml;kleme kullan&#305;l&#305;yor
-=======
- <div class="section" title="Using chain loading">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e927"></a>Using chain loading
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -303,29 +216,17 @@
-<<<<<<< HEAD
<p>&Ouml;ny&uuml;klenebilir bir Mageia istemiyor fakat bir ba&#351;ka i&#351;letim sisteminden
zincirleme y&uuml;klenmesini istiyorsan&#305;z, <span class="guibutton">&#304;leri</span> ve
<span class="guibutton">Geli&#351;mi&#351;</span> d&uuml;&#287;melerine t&#305;klayarak <span class="guibutton">ESP veya
MBR'ye dokunma</span> kutucu&#287;unu i&#351;aretleyin.
-=======
- <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>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>&Ouml;ny&uuml;kleyicinin eksik oldu&#287;una dair bir uyar&#305; alacaks&#305;n&#305;z. Ancak bunu
<span class="guibutton">Tamam</span> d&uuml;&#287;mesine t&#305;klayarak atlay&#305;n.
-=======
- <p>You will get a warning that the bootloader is missing, ignore it by clicking
- <span class="guibutton">OK</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -337,11 +238,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e938"></a>Se&ccedil;enekler
-=======
- <h3 class="title"><a name="d5e941"></a>Se&ccedil;enekler
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -349,19 +246,11 @@
-<<<<<<< HEAD
<div class="section" title="&#304;lk sayfa">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e940"></a>&#304;lk sayfa
-=======
- <div class="section" title="First page">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e943"></a>First page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -373,71 +262,44 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&Ouml;ntan&#305;ml&#305; g&ouml;r&uuml;nt&uuml;n&uuml;n y&uuml;klemesinden &ouml;nceki gecikme</span>: Bu
metin kutusu &ouml;ntan&#305;ml&#305; i&#351;letim sistemi ba&#351;lat&#305;lmadan &ouml;nceki gecikme
s&uuml;resini saniye cinsinden ayarlaman&#305;z&#305; sa&#287;lar.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guibutton">G&uuml;venlik</span>: &Ouml;ny&uuml;kleyici i&ccedil;in bir parola ayarlaman&#305;z&#305;
sa&#287;lar. B&ouml;ylece &ouml;ny&uuml;kleme s&#305;ras&#305;nda &ouml;ny&uuml;kleme girdisini se&ccedil;mek veya ayarlar&#305;
de&#287;i&#351;tirmek i&ccedil;in bir kullan&#305;c&#305; ad&#305; ile parolas&#305; sorulur. Kullan&#305;c&#305; ad&#305;
"root" ve parola da burada se&ccedil;ilendir.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Parola</span>: Bu metin kutusu parolan&#305;z&#305; olu&#351;turaca&#287;&#305;n&#305;z
k&#305;s&#305;md&#305;r
-=======
- <p><span class="guilabel">Password</span>: This text box is where you actually put the
- password
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Parola (tekrar)</span>: Parolan&#305;z&#305; yeniden yaz&#305;n. B&ouml;ylece
Drakx &uuml;stte yaz&#305;lan parola ile uyu&#351;up uyu&#351;mad&#305;&#287;&#305;n&#305; denetler.
-=======
- <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will
- check that it matches with the one set above.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Geli&#351;mi&#351;</span></p>
-=======
- <p><span class="guilabel">Advanced</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">ACPI &ouml;zelli&#287;ini etkinle&#351;tir:</span> ACPI (Geli&#351;mi&#351;
Yap&#305;land&#305;rma ve G&uuml;&ccedil; Arabirimi) bir g&uuml;&ccedil; y&ouml;netimi standard&#305;d&#305;r. Kullan&#305;lmayan
ayg&#305;tlar&#305; durdurarak, ki bu APM &ouml;ncesinde kullan&#305;lan y&ouml;ntemdir, enerji
@@ -445,55 +307,30 @@
&ccedil;&uuml;nk&uuml; bilgisayar&#305;n&#305;z ACPI' yi desteklemiyor olabilir veya ACPI
uygulamas&#305;n&#305;n baz&#305; sorunlara (mesela rastgele yeniden ba&#351;latmalar veya
sistem kilitlenmeleri) yol a&ccedil;t&#305;&#287;&#305;n&#305; d&uuml;&#351;&uuml;n&uuml;yor olabilirsiniz.
-=======
- <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).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">SMP &ouml;zelli&#287;ini etkinle&#351;tir</span>: Bu se&ccedil;enek, &ccedil;ok &ccedil;ekirdekli
i&#351;lemcilerde simetrik &ccedil;oklu i&#351;lemeyi etkinle&#351;tirir veya devre d&#305;&#351;&#305; b&#305;rak&#305;r.
-=======
- <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
- multiprocessing for multi core processors.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">APIC &ouml;zelli&#287;ini etkinle&#351;tir</span>: Bunu etkinle&#351;tirmek
i&#351;letim sisteminin Geli&#351;mi&#351; Programlanabilir Kesme Denetleyicisi-APIC-ne
eri&#351;imini sa&#287;lar. APIC ayg&#305;tlar&#305; daha karma&#351;&#305;k &ouml;ncelikleme modellerine ve
Geli&#351;mi&#351; IRQ (Kesme Talebi) y&ouml;netimine izin verir.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Yerel APIC &ouml;zelli&#287;ini etkinle&#351;tir</span>: Burada, bir SMP
sistemde belli bir i&#351;lemci i&ccedil;in t&uuml;m d&#305;&#351; kesmeleri y&ouml;neten yerel APIC
&ouml;zelli&#287;ini ayarlayabilirsiniz.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -507,19 +344,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Sonraki sayfa">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e972"></a>Sonraki sayfa
-=======
- <div class="section" title="Next page">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e975"></a>Next page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -531,70 +360,43 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&Ouml;ntan&#305;ml&#305;:</span> &Ouml;ntan&#305;ml&#305; olarak ba&#351;lat&#305;lacak i&#351;letim
sistemi
-=======
- <p><span class="guilabel">Default:</span> Operating system started up by default
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Sonuna ekle:</span> Bu se&ccedil;enek &ccedil;ekirdek bilgisini ge&ccedil;menizi
veya &ccedil;ekirde&#287;e &ouml;ny&uuml;kleme s&#305;ras&#305;nda daha fazla bilgi vermesini s&ouml;ylemenizi
sa&#287;lar.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Yabanc&#305; &#304;&#351;letim Sistemini Sorgula</span>: yukar&#305;ya bak&#305;n&#305;z
<a class="link" href="setupBootloader.html#setupMageiaBootloader">Bir Mageia &ouml;ny&uuml;kleyicisini
kullanma</a></p>
-=======
- <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Geli&#351;mi&#351;</span></p>
-=======
- <p><span class="guilabel">Advanced</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Ekran kipi:</span> Bu se&ccedil;enek, &ouml;ny&uuml;kleme men&uuml;s&uuml;n&uuml;n kullanaca&#287;&#305;
ekran boyutunu ve renk derinli&#287;ini ayarlar. A&#351;a&#287;&#305; y&ouml;nl&uuml; &uuml;&ccedil;gene
t&#305;klad&#305;&#287;&#305;n&#305;zda daha fazla boyut ve renk derinli&#287;i se&ccedil;enekleri &ouml;nerilir.
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="bold"><strong>ESP veya MBR'ye dokunma </strong></span>: yukar&#305;ya bak&#305;n&#305;z
<a class="link" href="setupBootloader.html#setupChainLoading">Zincirleme y&uuml;klemeyi kullanma</a></p>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
diff --git a/tr/setupBootloaderAddEntry.html b/tr/setupBootloaderAddEntry.html
index a2c27cf..e445e8d 100644
--- a/tr/setupBootloaderAddEntry.html
+++ b/tr/setupBootloaderAddEntry.html
@@ -27,14 +27,9 @@
-<<<<<<< HEAD
<p>Bunu yapmak i&ccedil;in /boot/grub2/custom.cfg dosyas&#305;n&#305; elle d&uuml;zenlemeli veya
Mageia veri kaynaklar&#305;nda bulunan grub-customizer yaz&#305;l&#305;m&#305;n&#305;
kullanmal&#305;s&#305;n&#305;z.
-=======
- <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).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -47,11 +42,7 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Daha fazla bilgi i&ccedil;in wiki sayfam&#305;z&#305; okuyun: </p>
-=======
- <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>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/tr/uninstall-Mageia.html b/tr/uninstall-Mageia.html
index c861b84..e96fe31 100644
--- a/tr/uninstall-Mageia.html
+++ b/tr/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1243"></a>Nas&#305;l
-=======
- <h3 class="title"><a name="d5e1247"></a>Nas&#305;l
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/uk/Select-and-use-ISOs.html b/uk/Select-and-use-ISOs.html
index 7591f6b..673e5c2 100644
--- a/uk/Select-and-use-ISOs.html
+++ b/uk/Select-and-use-ISOs.html
@@ -139,27 +139,6 @@
<p>&#1042;&#1086;&#1085;&#1080; &#1087;&#1088;&#1080;&#1076;&#1072;&#1090;&#1085;&#1110; &#1076;&#1083;&#1103; &#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1085;&#1103; &laquo;&#1079; &#1085;&#1091;&#1083;&#1103;&raquo; &#1072;&#1073;&#1086; &#1086;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1085;&#1103; &#1087;&#1086;&#1087;&#1077;&#1088;&#1077;&#1076;&#1085;&#1110;&#1093; &#1074;&#1080;&#1087;&#1091;&#1089;&#1082;&#1110;&#1074;.</p>
</li>
-<<<<<<< HEAD
-=======
- </ul>
- </div>
-
- </div>
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>&#1056;&#1110;&#1079;&#1085;&#1110; &#1085;&#1086;&#1089;&#1110;&#1111; &#1076;&#1083;&#1103; 32-&#1073;&#1110;&#1090;&#1086;&#1074;&#1086;&#1111; &#1090;&#1072; 64-&#1073;&#1110;&#1090;&#1086;&#1074;&#1086;&#1111; &#1072;&#1088;&#1093;&#1110;&#1090;&#1077;&#1082;&#1090;&#1091;&#1088;.</p>
@@ -197,11 +176,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; &#1085;&#1086;&#1089;&#1110;&#1081;
-=======
- <h4 class="title"><a name="d5e56"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; &#1085;&#1086;&#1089;&#1110;&#1081;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -212,11 +187,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>&#1058;&#1080;&#1087;&#1086;&#1074;&#1110; &#1084;&#1086;&#1078;&#1083;&#1080;&#1074;&#1086;&#1089;&#1090;&#1110;
-=======
- <h5 class="title"><a name="d5e58"></a>&#1058;&#1080;&#1087;&#1086;&#1074;&#1110; &#1084;&#1086;&#1078;&#1083;&#1080;&#1074;&#1086;&#1089;&#1090;&#1110;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -235,11 +206,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>&#1050;&#1086;&#1078;&#1077;&#1085; ISO &#1084;&#1110;&#1089;&#1090;&#1080;&#1090;&#1100; &#1083;&#1080;&#1096;&#1077; &#1086;&#1076;&#1085;&#1077; &#1089;&#1090;&#1110;&#1083;&#1100;&#1085;&#1080;&#1095;&#1085;&#1077; &#1089;&#1077;&#1088;&#1077;&#1076;&#1086;&#1074;&#1080;&#1097;&#1077; (&#1055;&#1083;&#1072;&#1079;&#1084;&#1091;, GNOME &#1072;&#1073;&#1086; Xfce).</p>
-=======
- <p>&#1050;&#1086;&#1078;&#1077;&#1085; ISO &#1084;&#1110;&#1089;&#1090;&#1080;&#1090;&#1100; &#1083;&#1080;&#1096;&#1077; &#1086;&#1076;&#1085;&#1077; &#1089;&#1090;&#1110;&#1083;&#1100;&#1085;&#1080;&#1095;&#1085;&#1077; &#1089;&#1077;&#1088;&#1077;&#1076;&#1086;&#1074;&#1080;&#1097;&#1077; (KDE, GNOME &#1072;&#1073;&#1086; Xfce).</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -268,11 +235,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; DVD &#1079; &#1055;&#1083;&#1072;&#1079;&#1084;&#1086;&#1102;
-=======
- <h5 class="title"><a name="d5e72"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; DVD &#1079; &#1055;&#1083;&#1072;&#1079;&#1084;&#1086;&#1102;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -293,11 +256,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>&#1051;&#1080;&#1096;&#1077; &#1076;&#1083;&#1103; 64-&#1073;&#1110;&#1090;&#1086;&#1074;&#1086;&#1111; &#1072;&#1088;&#1093;&#1110;&#1090;&#1077;&#1082;&#1090;&#1091;&#1088;&#1080;.</p>
-=======
- <p>&#1056;&#1110;&#1079;&#1085;&#1110; &#1085;&#1086;&#1089;&#1110;&#1111; &#1076;&#1083;&#1103; 32-&#1073;&#1110;&#1090;&#1086;&#1074;&#1086;&#1111; &#1090;&#1072; 64-&#1073;&#1110;&#1090;&#1086;&#1074;&#1086;&#1111; &#1072;&#1088;&#1093;&#1110;&#1090;&#1077;&#1082;&#1090;&#1091;&#1088;.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -309,11 +268,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; DVD &#1110;&#1079; GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; DVD &#1110;&#1079; GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -346,11 +301,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; DVD &#1079; Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>&#1055;&#1086;&#1088;&#1090;&#1072;&#1090;&#1080;&#1074;&#1085;&#1080;&#1081; DVD &#1079; Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -385,11 +336,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>&#1053;&#1086;&#1089;&#1110;&#1111; CD &#1083;&#1080;&#1096;&#1077; &#1076;&#1083;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;
-=======
- <h4 class="title"><a name="d5e99"></a>&#1053;&#1086;&#1089;&#1110;&#1111; CD &#1083;&#1080;&#1096;&#1077; &#1076;&#1083;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -400,11 +347,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>&#1058;&#1080;&#1087;&#1086;&#1074;&#1110; &#1084;&#1086;&#1078;&#1083;&#1080;&#1074;&#1086;&#1089;&#1090;&#1110;
-=======
- <h5 class="title"><a name="d5e101"></a>&#1058;&#1080;&#1087;&#1086;&#1074;&#1110; &#1084;&#1086;&#1078;&#1083;&#1080;&#1074;&#1086;&#1089;&#1090;&#1110;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -451,11 +394,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -480,11 +419,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -513,11 +448,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>&#1054;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1085;&#1103; &#1090;&#1072; &#1087;&#1077;&#1088;&#1077;&#1074;&#1110;&#1088;&#1082;&#1072; &#1085;&#1086;&#1089;&#1110;&#1111;&#1074; &#1076;&#1072;&#1085;&#1080;&#1093;
-=======
- <h3 class="title"><a name="d5e122"></a>&#1054;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1085;&#1103; &#1090;&#1072; &#1087;&#1077;&#1088;&#1077;&#1074;&#1110;&#1088;&#1082;&#1072; &#1085;&#1086;&#1089;&#1110;&#1111;&#1074; &#1076;&#1072;&#1085;&#1080;&#1093;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -528,11 +459,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>&#1054;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1085;&#1103;
-=======
- <h4 class="title"><a name="d5e124"></a>&#1054;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1085;&#1103;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -562,11 +489,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>&#1055;&#1077;&#1088;&#1077;&#1074;&#1110;&#1088;&#1082;&#1072; &#1094;&#1110;&#1083;&#1110;&#1089;&#1085;&#1086;&#1089;&#1090;&#1110; &#1086;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1080;&#1093; &#1076;&#1072;&#1085;&#1080;&#1093; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091;
-=======
- <h4 class="title"><a name="d5e136"></a>&#1055;&#1077;&#1088;&#1077;&#1074;&#1110;&#1088;&#1082;&#1072; &#1094;&#1110;&#1083;&#1110;&#1089;&#1085;&#1086;&#1089;&#1090;&#1110; &#1086;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1080;&#1093; &#1076;&#1072;&#1085;&#1080;&#1093;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -609,11 +532,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO
-=======
- <h3 class="title"><a name="d5e149"></a>&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -629,11 +548,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO &#1085;&#1072; &#1082;&#1086;&#1084;&#1087;&#1072;&#1082;&#1090;-&#1076;&#1080;&#1089;&#1082; &#1072;&#1073;&#1086; DVD
-=======
- <h4 class="title"><a name="d5e152"></a>&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO &#1085;&#1072; &#1082;&#1086;&#1084;&#1087;&#1072;&#1082;&#1090;-&#1076;&#1080;&#1089;&#1082; &#1072;&#1073;&#1086; DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -653,11 +568,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO &#1085;&#1072; &#1092;&#1083;&#1077;&#1096;&#1082;&#1091; USB
-=======
- <h4 class="title"><a name="d5e157"></a>&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO &#1085;&#1072; &#1092;&#1083;&#1077;&#1096;&#1082;&#1091; USB
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -695,11 +606,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1110;&#1085;&#1089;&#1090;&#1088;&#1091;&#1084;&#1077;&#1085;&#1090;&#1072; &#1110;&#1079; &#1075;&#1088;&#1072;&#1092;&#1110;&#1095;&#1085;&#1080;&#1084; &#1110;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089;&#1086;&#1084; &#1091; Mageia
-=======
- <h5 class="title"><a name="d5e163"></a>&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1110;&#1085;&#1089;&#1090;&#1088;&#1091;&#1084;&#1077;&#1085;&#1090;&#1072; &#1110;&#1079; &#1075;&#1088;&#1072;&#1092;&#1110;&#1095;&#1085;&#1080;&#1084; &#1110;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089;&#1086;&#1084; &#1091; Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -715,11 +622,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1110;&#1085;&#1089;&#1090;&#1088;&#1091;&#1084;&#1077;&#1085;&#1090;&#1072; &#1110;&#1079; &#1075;&#1088;&#1072;&#1092;&#1110;&#1095;&#1085;&#1080;&#1084; &#1110;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089;&#1086;&#1084; &#1091; Windows
-=======
- <h5 class="title"><a name="d5e167"></a>&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1110;&#1085;&#1089;&#1090;&#1088;&#1091;&#1084;&#1077;&#1085;&#1090;&#1072; &#1110;&#1079; &#1075;&#1088;&#1072;&#1092;&#1110;&#1095;&#1085;&#1080;&#1084; &#1110;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089;&#1086;&#1084; &#1091; Windows
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -741,11 +644,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>&#1047;&#1072; &#1076;&#1086;&#1087;&#1086;&#1084;&#1086;&#1075;&#1086;&#1102; &#1110;&#1085;&#1089;&#1090;&#1088;&#1091;&#1084;&#1077;&#1085;&#1090;&#1110;&#1074; &#1082;&#1086;&#1084;&#1072;&#1085;&#1076;&#1085;&#1086;&#1075;&#1086; &#1088;&#1103;&#1076;&#1082;&#1072; &#1091; &#1089;&#1080;&#1089;&#1090;&#1077;&#1084;&#1110; GNU/Linux
-=======
- <h5 class="title"><a name="d5e174"></a>&#1047;&#1072; &#1076;&#1086;&#1087;&#1086;&#1084;&#1086;&#1075;&#1086;&#1102; &#1110;&#1085;&#1089;&#1090;&#1088;&#1091;&#1084;&#1077;&#1085;&#1090;&#1110;&#1074; &#1082;&#1086;&#1084;&#1072;&#1085;&#1076;&#1085;&#1086;&#1075;&#1086; &#1088;&#1103;&#1076;&#1082;&#1072; &#1091; &#1089;&#1080;&#1089;&#1090;&#1077;&#1084;&#1110; GNU/Linux
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/uk/index.html b/uk/index.html
index aa0836b..768d446 100644
--- a/uk/index.html
+++ b/uk/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">&#1042;&#1089;&#1090;&#1091;&#1087;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">&#1053;&#1086;&#1089;&#1110;&#1081;</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">&#1054;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1085;&#1103; &#1090;&#1072; &#1087;&#1077;&#1088;&#1077;&#1074;&#1110;&#1088;&#1082;&#1072; &#1085;&#1086;&#1089;&#1110;&#1111;&#1074; &#1076;&#1072;&#1085;&#1080;&#1093;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">&#1054;&#1090;&#1088;&#1080;&#1084;&#1072;&#1085;&#1085;&#1103; &#1090;&#1072; &#1087;&#1077;&#1088;&#1077;&#1074;&#1110;&#1088;&#1082;&#1072; &#1085;&#1086;&#1089;&#1110;&#1111;&#1074; &#1076;&#1072;&#1085;&#1080;&#1093;</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">&#1047;&#1072;&#1087;&#1080;&#1089; &#1086;&#1073;&#1088;&#1072;&#1079;&#1091; ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, &#1087;&#1088;&#1086;&#1075;&#1088;&#1072;&#1084;&#1072; &#1076;&#1083;&#1103; &#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1085;&#1103; Mageia</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">&#1054;&#1089;&#1085;&#1086;&#1074;&#1085;&#1110; &#1087;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1080; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1072;</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e884">&#1030;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1072;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e908">&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084; Mageia</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e922">&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1074;&#1078;&#1077; &#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1080;&#1084; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e925">&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1083;&#1072;&#1085;&#1094;&#1102;&#1075;&#1086;&#1074;&#1086;&#1075;&#1086; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e939">&#1055;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1080;</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e887">&#1030;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1072;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e911">&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084; Mageia</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e925">&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1074;&#1078;&#1077; &#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1080;&#1084; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e928">&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1083;&#1072;&#1085;&#1094;&#1102;&#1075;&#1086;&#1074;&#1086;&#1075;&#1086; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e942">&#1055;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1080;</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">&#1044;&#1086;&#1076;&#1072;&#1074;&#1072;&#1085;&#1085;&#1103; &#1087;&#1091;&#1085;&#1082;&#1090;&#1091; &#1084;&#1077;&#1085;&#1102; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103; &#1090;&#1072; &#1074;&#1085;&#1077;&#1089;&#1077;&#1085;&#1085;&#1103; &#1079;&#1084;&#1110;&#1085; &#1091; &#1090;&#1072;&#1082;&#1110; &#1087;&#1091;&#1085;&#1082;&#1090;&#1080;</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">&#1042;&#1080;&#1083;&#1091;&#1095;&#1077;&#1085;&#1085;&#1103; Mageia</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1244">&#1053;&#1072;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1080;</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">&#1053;&#1072;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1080;</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/uk/setupBootloader.html b/uk/setupBootloader.html
index c4c57ca..7f4d674 100644
--- a/uk/setupBootloader.html
+++ b/uk/setupBootloader.html
@@ -33,11 +33,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e884"></a>&#1030;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1072;
-=======
- <h3 class="title"><a name="d5e887"></a>&#1030;&#1085;&#1090;&#1077;&#1088;&#1092;&#1077;&#1081;&#1089; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1072;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -85,11 +81,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e894"></a>Grub2 &#1076;&#1083;&#1103; &#1079;&#1072;&#1089;&#1090;&#1072;&#1088;&#1110;&#1083;&#1080;&#1093; &#1089;&#1080;&#1089;&#1090;&#1077;&#1084; &#1110;&#1079; MBR &#1090;&#1072; GPT
-=======
- <h4 class="title"><a name="d5e897"></a>Grub2 &#1076;&#1083;&#1103; &#1079;&#1072;&#1089;&#1090;&#1072;&#1088;&#1110;&#1083;&#1080;&#1093; &#1089;&#1080;&#1089;&#1090;&#1077;&#1084; &#1110;&#1079; MBR &#1090;&#1072; GPT
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -110,11 +102,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e900"></a>Grub2-efi &#1091; &#1089;&#1080;&#1089;&#1090;&#1077;&#1084;&#1072;&#1093; UEFI
-=======
- <h4 class="title"><a name="d5e903"></a>Grub2-efi &#1091; &#1089;&#1080;&#1089;&#1090;&#1077;&#1084;&#1072;&#1093; UEFI
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -154,11 +142,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e908"></a>&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084; Mageia
-=======
- <h3 class="title"><a name="d5e911"></a>&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084; Mageia
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -202,11 +186,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e922"></a>&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1074;&#1078;&#1077; &#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1080;&#1084; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084;
-=======
- <h3 class="title"><a name="d5e925"></a>&#1050;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1085;&#1085;&#1103; &#1074;&#1078;&#1077; &#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1083;&#1077;&#1085;&#1080;&#1084; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1077;&#1084;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -229,11 +209,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e925"></a>&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1083;&#1072;&#1085;&#1094;&#1102;&#1075;&#1086;&#1074;&#1086;&#1075;&#1086; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;
-=======
- <h3 class="title"><a name="d5e928"></a>&#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1083;&#1072;&#1085;&#1094;&#1102;&#1075;&#1086;&#1074;&#1086;&#1075;&#1086; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -265,11 +241,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e939"></a>&#1055;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1080;
-=======
- <h3 class="title"><a name="d5e942"></a>&#1055;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1080;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -281,11 +253,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e941"></a>&#1055;&#1077;&#1088;&#1096;&#1072; &#1089;&#1090;&#1086;&#1088;&#1110;&#1085;&#1082;&#1072;
-=======
- <h4 class="title"><a name="d5e944"></a>&#1055;&#1077;&#1088;&#1096;&#1072; &#1089;&#1090;&#1086;&#1088;&#1110;&#1085;&#1082;&#1072;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -307,14 +275,9 @@
<p><span class="guilabel">&#1041;&#1077;&#1079;&#1087;&#1077;&#1082;&#1072;</span>: &#1079;&#1072; &#1076;&#1086;&#1087;&#1086;&#1084;&#1086;&#1075;&#1086;&#1102; &#1094;&#1100;&#1086;&#1075;&#1086; &#1088;&#1086;&#1079;&#1076;&#1110;&#1083;&#1091; &#1074;&#1080; &#1084;&#1086;&#1078;&#1077;&#1090;&#1077;
&#1074;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1080;&#1090;&#1080; &#1087;&#1072;&#1088;&#1086;&#1083;&#1100; &#1076;&#1083;&#1103; &#1076;&#1086;&#1089;&#1090;&#1091;&#1087;&#1091; &#1076;&#1086; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1091;&#1074;&#1072;&#1095;&#1072;. &#1042;&#1080;&#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1072;&#1085;&#1085;&#1103; &#1087;&#1072;&#1088;&#1086;&#1083;&#1103;
-<<<<<<< HEAD
&#1086;&#1079;&#1085;&#1072;&#1095;&#1072;&#1090;&#1080;&#1084;&#1077;, &#1097;&#1086; &#1076;&#1083;&#1103; &#1074;&#1080;&#1073;&#1086;&#1088;&#1091; &#1079;&#1072;&#1087;&#1080;&#1089;&#1091; &#1076;&#1083;&#1103; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103; &#1072;&#1073;&#1086; &#1079;&#1084;&#1110;&#1085;&#1080; &#1087;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1110;&#1074;
&#1076;&#1086;&#1074;&#1077;&#1076;&#1077;&#1090;&#1100;&#1089;&#1103; &#1074;&#1074;&#1086;&#1076;&#1080;&#1090;&#1080; &#1087;&#1072;&#1088;&#1086;&#1083;&#1100;. &#1030;&#1084;&#1077;&#1085;&#1077;&#1084; &#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1095;&#1072; &#1073;&#1091;&#1076;&#1077; &laquo;root&raquo;, &#1072; &#1087;&#1072;&#1088;&#1086;&#1083;&#1100; &#1084;&#1086;&#1078;&#1085;&#1072;
&#1073;&#1091;&#1076;&#1077; &#1074;&#1080;&#1073;&#1088;&#1072;&#1090;&#1080; &#1085;&#1072; &#1085;&#1072;&#1089;&#1090;&#1091;&#1087;&#1085;&#1086;&#1084;&#1091; &#1077;&#1090;&#1072;&#1087;&#1110;.
-=======
- &#1086;&#1079;&#1085;&#1072;&#1095;&#1072;&#1090;&#1080;&#1084;&#1077;, &#1097;&#1086; &#1110;&#1085;&#1096;&#1110; &#1086;&#1089;&#1086;&#1073;&#1080; &#1085;&#1077; &#1079;&#1084;&#1086;&#1078;&#1091;&#1090;&#1100; &#1091;&#1074;&#1110;&#1081;&#1090;&#1080; &#1076;&#1086; &#1088;&#1077;&#1078;&#1080;&#1084;&#1091; &#1086;&#1076;&#1085;&#1086;&#1075;&#1086; &#1082;&#1086;&#1088;&#1080;&#1089;&#1090;&#1091;&#1074;&#1072;&#1095;&#1072; &#1072;&#1073;&#1086;
- &#1079;&#1084;&#1110;&#1085;&#1080;&#1090;&#1080; &#1087;&#1072;&#1088;&#1072;&#1084;&#1077;&#1090;&#1088;&#1080; &#1087;&#1110;&#1076; &#1095;&#1072;&#1089; &#1079;&#1072;&#1074;&#1072;&#1085;&#1090;&#1072;&#1078;&#1077;&#1085;&#1085;&#1103;.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -393,11 +356,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e973"></a>&#1053;&#1072;&#1089;&#1090;&#1091;&#1087;&#1085;&#1072; &#1089;&#1090;&#1086;&#1088;&#1110;&#1085;&#1082;&#1072;
-=======
- <h4 class="title"><a name="d5e976"></a>&#1053;&#1072;&#1089;&#1090;&#1091;&#1087;&#1085;&#1072; &#1089;&#1090;&#1086;&#1088;&#1110;&#1085;&#1082;&#1072;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
diff --git a/uk/uninstall-Mageia.html b/uk/uninstall-Mageia.html
index e5bb393..7df7f2f 100644
--- a/uk/uninstall-Mageia.html
+++ b/uk/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1244"></a>&#1053;&#1072;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1080;
-=======
- <h3 class="title"><a name="d5e1247"></a>&#1053;&#1072;&#1089;&#1090;&#1072;&#1085;&#1086;&#1074;&#1080;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
diff --git a/update-help_files.sh b/update-help_files.sh
index 65a5bf1..00851e1 100755
--- a/update-help_files.sh
+++ b/update-help_files.sh
@@ -17,7 +17,7 @@
set -e
-LANGS="ca cs de el en eo es et eu fr hr hu id it nl pl pt pt_br ro ru sk sl sq sv tr uk zh_cn"
+LANGS="ca cs de el en eo es et eu fr hr hu id it nl nb pl pt pt_br ro ru sk sl sq sv tr uk zh_cn"
DLPATH="http://docteam.mageia.nl/zipped/drakx-installer-help/"
diff --git a/zh_cn/Select-and-use-ISOs.html b/zh_cn/Select-and-use-ISOs.html
index b1453c6..710a338 100644
--- a/zh_cn/Select-and-use-ISOs.html
+++ b/zh_cn/Select-and-use-ISOs.html
@@ -37,15 +37,8 @@
<p>Mageia &#36890;&#36807; ISO &#38236;&#20687;&#36827;&#34892;&#20998;&#21457;&#12290;&#27492;&#39029;&#23558;&#24110;&#21161;&#24744;&#36873;&#25321;&#25152;&#38656;&#30340;&#38236;&#20687;&#12290;</p>
-<<<<<<< HEAD
<p>&#26377;&#20004;&#31181;&#31867;&#22411;&#30340;&#23186;&#20171;&#65306;</p>
-=======
-
-
- <p>&#26377;&#20004;&#31181;&#31867;&#22411;&#30340;&#23186;&#20171;&#65306;</p>
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -89,10 +82,6 @@
<p>&#23186;&#20171;&#65306;&#26159;&#19968;&#31867;&#25215;&#36733; ISO &#25991;&#20214;&#12289;&#21487;&#20197;&#29992;&#20110;&#23433;&#35013;&#21644;/&#25110;&#26356;&#26032; Mageia &#30340;&#20219;&#24847;&#29289;&#29702;&#20171;&#36136;&#12290;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&#24744;&#21487;&#20197;&#22312;<a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">&#36825;&#37324;</a>&#25214;&#21040;&#23427;&#20204;&#12290;
</p>
@@ -133,29 +122,6 @@
<p>&#23427;&#20204;&#21487;&#20197;&#29992;&#20110;&#20840;&#26032;&#23433;&#35013;&#65292;&#25110;&#26356;&#26032;&#20043;&#21069;&#30340;&#29256;&#26412;&#12290;</p>
</li>
-<<<<<<< HEAD
-=======
- </ul>
- </div>
-
- </div>
-
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
@@ -187,11 +153,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>Live &#23186;&#20171;
-=======
- <h4 class="title"><a name="d5e56"></a>Live &#23186;&#20171;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -202,11 +164,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>&#36890;&#29992;&#29305;&#24615;
-=======
- <h5 class="title"><a name="d5e58"></a>&#36890;&#29992;&#29305;&#24615;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -222,11 +180,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>&#27599;&#20010; ISO &#20165;&#21253;&#21547;&#19968;&#31181;&#26700;&#38754;&#29615;&#22659;&#65288;KDE Plasma&#12289;GNOME &#25110; Xfce&#65289;&#12290;</p>
-=======
- <p>&#27599;&#20010; ISO &#20165;&#21253;&#21547;&#19968;&#31181;&#26700;&#38754;&#29615;&#22659;&#65288;KDE&#12289;GNOME &#25110; Xfce&#65289;&#12290;</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -253,11 +207,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>Live DVD KDE
-=======
- <h5 class="title"><a name="d5e72"></a>Live DVD KDE
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -278,11 +228,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>&#20165;&#25903;&#25345; 64 &#20301;&#22788;&#29702;&#22120;&#12290;</p>
-=======
- <p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -294,11 +240,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>Live DVD GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>Live DVD GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -319,11 +261,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>&#20165;&#25903;&#25345; 64 &#20301;&#22788;&#29702;&#22120;</p>
-=======
- <p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -335,11 +273,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>Live DVD Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>Live DVD Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -360,11 +294,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>&#21516;&#26102;&#25903;&#25345; 32 &#20301;&#21644; 64 &#20301;&#22788;&#29702;&#22120;&#12290;</p>
-=======
- <p>&#23186;&#20171;&#26377; 32 &#20301;&#21644; 64 &#20301;&#20004;&#31181;&#26550;&#26500;&#20043;&#20998;&#12290;</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -378,11 +308,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>&#20165;&#29992;&#20110;&#24341;&#23548;&#30340; CD
-=======
- <h4 class="title"><a name="d5e99"></a>&#20165;&#29992;&#20110;&#24341;&#23548;&#30340; CD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -393,11 +319,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>&#36890;&#29992;&#29305;&#24615;
-=======
- <h5 class="title"><a name="d5e101"></a>&#36890;&#29992;&#29305;&#24615;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -437,11 +359,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -464,11 +382,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -495,11 +409,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;
-=======
- <h3 class="title"><a name="d5e122"></a>&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -510,11 +420,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>&#19979;&#36733;&#20013;
-=======
- <h4 class="title"><a name="d5e124"></a>&#19979;&#36733;&#20013;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -538,31 +444,18 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>&#26816;&#26597;&#19979;&#36733;&#25991;&#20214;&#30340;&#23436;&#25972;&#24615;
-=======
- <h4 class="title"><a name="d5e136"></a>&#26816;&#26597;&#19979;&#36733;&#25991;&#20214;&#30340;&#23436;&#25972;&#24615;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
</div>
-<<<<<<< HEAD
<p>&#36825;&#20004;&#31181;&#26657;&#39564;&#21644;&#22343;&#30001;&#29305;&#23450;&#31639;&#27861;&#35745;&#31639;&#25991;&#20214;&#20869;&#23481;&#20135;&#29983;&#65292;&#19988;&#22343;&#20026;&#21313;&#20845;&#36827;&#21046;&#25968;&#23383;&#12290;&#24403;&#24744;&#20351;&#29992;&#36825;&#20123;&#31639;&#27861;&#26469;&#37325;&#26032;&#35745;&#31639;&#19979;&#36733;&#25991;&#20214;&#30340;&#26657;&#39564;&#20540;&#26102;&#65292;&#22914;&#26524;&#24744;&#24471;&#21040;&#30340;&#32467;&#26524;&#21644; Mageia
&#25552;&#20379;&#30340;&#19968;&#33268;&#65292;&#35828;&#26126;&#24744;&#30340;&#25991;&#20214;&#27809;&#26377;&#38382;&#39064;&#65307;&#21542;&#21017;&#65292;&#35828;&#26126;&#19979;&#36733;&#22833;&#36133;&#65292;&#24744;&#21487;&#33021;&#38656;&#35201;&#37325;&#26032;&#19979;&#36733;&#65292;&#25110;&#25913;&#29992; BitTorrent &#19979;&#36733;&#12290;
-=======
- <p>&#36825;&#20004;&#31181;&#26657;&#39564;&#21644;&#22343;&#30001;&#29305;&#23450;&#31639;&#27861;&#35745;&#31639;&#25991;&#20214;&#20869;&#23481;&#20135;&#29983;&#65292;&#19988;&#22343;&#20026;&#21313;&#20845;&#36827;&#21046;&#25968;&#23383;&#12290;&#33509;&#24744;&#37325;&#26032;&#35745;&#31639;&#24471;&#21040;&#30340;&#26657;&#39564;&#21644;&#19982; Mageia
- &#25552;&#20379;&#30340;&#26657;&#39564;&#21644;&#19968;&#33268;&#65292;&#35828;&#26126;&#24744;&#19979;&#36733;&#30340;&#25991;&#20214;&#20869;&#23481;&#27491;&#30830;&#65307;&#21542;&#21017;&#65292;&#35828;&#26126;&#24744;&#19979;&#36733;&#22833;&#36133;&#65288;&#25991;&#20214;&#21487;&#33021;&#19981;&#23436;&#25972;&#25110;&#24050;&#25439;&#22351;&#65289;&#65292;&#24744;&#24212;&#24403;&#37325;&#26032;&#19979;&#36733;&#12290;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>&#25171;&#24320;&#19968;&#20010;&#32456;&#31471;&#65288;&#26080;&#38656;&#20197; root &#36523;&#20221;&#25805;&#20316;&#65289;&#65292;&#28982;&#21518;&#65306;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>- &#33509;&#20351;&#29992; md5sum&#65292;&#35831;&#36755;&#20837;&#65306;[sam@localhost]$ <strong class="userinput"><code>md5sum
path/to/the/image/file.iso</code></strong>&#12290;
@@ -573,10 +466,6 @@
</p>
<p>&#28982;&#21518;&#27604;&#36739;&#25191;&#34892;&#32467;&#26524;&#65288;&#21487;&#33021;&#38656;&#35201;&#31561;&#24453;&#19968;&#27573;&#26102;&#38388;&#65289;&#21644; Mageia &#32593;&#19978;&#25552;&#20379;&#30340;&#25968;&#20540;&#12290;&#20363;&#22914;&#65306;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p></p>
@@ -589,11 +478,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>&#21051;&#24405;&#25110;&#36716;&#20648; ISO
-=======
- <h3 class="title"><a name="d5e149"></a>&#21051;&#24405;&#25110;&#36716;&#20648; ISO
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -601,20 +486,12 @@
<p>&#32463;&#36807;&#26816;&#26597;&#21518;&#30340; ISO &#21363;&#21487;&#34987;&#21051;&#24405;&#33267; CD/DVD&#65292;&#25110;&#20889;&#20837;&#21040; U &#30424;&#12290;&#36825;&#20123;&#25805;&#20316;&#19981;&#21516;&#20110;&#31616;&#21333;&#30340;&#22797;&#21046;&#65292;&#20854;&#30446;&#30340;&#26159;&#21019;&#24314;&#19968;&#20010;&#21487;&#24341;&#23548;&#30340;&#23186;&#20307;&#12290;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="&#23558;ISO&#25991;&#20214;&#21051;&#24405;&#21040;CD&#25110;DVD">
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>&#23558;ISO&#25991;&#20214;&#21051;&#24405;&#21040;CD&#25110;DVD
-=======
- <h4 class="title"><a name="d5e152"></a>&#23558;ISO&#25991;&#20214;&#21051;&#24405;&#21040;CD&#25110;DVD
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -631,11 +508,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>&#20889;&#20837; ISO &#21040; U &#30424;
-=======
- <h4 class="title"><a name="d5e157"></a>&#20889;&#20837; ISO &#21040; U &#30424;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -643,10 +516,6 @@
<p>&#25152;&#26377;&#30340; Mageia ISO &#22343;&#20026;&#28151;&#21512;&#31867;&#22411; ISO&#65292;&#22240;&#27492;&#24744;&#21487;&#20197;&#23558;&#20854;&#8220;&#36716;&#20648;&#8221;&#21040; U &#30424;&#20013;&#65292;&#28982;&#21518;&#20351;&#29992; U &#30424;&#26469;&#24341;&#23548;&#21644;&#23433;&#35013;&#31995;&#32479;&#12290;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="warning" title="&#35686;&#21578;" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
@@ -665,20 +534,12 @@
</div>
<p>&#33509;&#35201;&#24674;&#22797;&#21407;&#22987;&#23481;&#37327;&#65292;&#24744;&#24517;&#39035;&#37325;&#26032;&#36827;&#34892;&#20998;&#21306;&#21644;&#26684;&#24335;&#21270;&#25805;&#20316;&#12290;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="section" title="&#20351;&#29992; Mageia &#30340;&#22270;&#24418;&#21270;&#24037;&#20855;">
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>&#20351;&#29992; Mageia &#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
-=======
- <h5 class="title"><a name="d5e163"></a>&#20351;&#29992; Mageia &#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -695,11 +556,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>&#20351;&#29992; Windows &#19979;&#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
-=======
- <h5 class="title"><a name="d5e167"></a>&#20351;&#29992; Windows &#19979;&#30340;&#22270;&#24418;&#21270;&#24037;&#20855;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -707,10 +564,6 @@
<p>&#24744;&#21487;&#20197;&#23581;&#35797;&#65306;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a> &#20013;&#30340;&#8220;ISO
&#38236;&#20687;&#8221;&#36873;&#39033;&#65307;
@@ -725,11 +578,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>&#20351;&#29992; GNU/Linux &#31995;&#32479;&#20013;&#30340;&#21629;&#20196;&#34892;&#31243;&#24207;
-=======
- <h5 class="title"><a name="d5e174"></a>&#20351;&#29992; GNU/Linux &#31995;&#32479;&#20013;&#30340;&#21629;&#20196;&#34892;&#31243;&#24207;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -753,10 +602,6 @@
</div>
<p>&#24744;&#20063;&#21487;&#20197;&#22312;&#32456;&#31471;&#20013;&#20351;&#29992; dd &#24037;&#20855;&#65306;</p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="orderedlist">
<ol class="orderedlist" type="1">
@@ -780,18 +625,10 @@
<li class="listitem">
<p>&#36755;&#20837;&#21629;&#20196; <strong class="userinput"><code>fdisk -l</code></strong></p>
-<<<<<<< HEAD
-=======
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&#25110;&#32773;&#65292;&#24744;&#20063;&#21487;&#20197;&#36890;&#36807;&#21629;&#20196; <code class="code">dmesg</code> &#26469;&#26597;&#30475;&#35774;&#22791;&#21517;&#65306;&#22312;&#36755;&#20837;&#26411;&#23614;&#65292;&#24744;&#23558;&#30475;&#21040;&#20197; <span class="emphasis"><em>sd</em></span>
&#24320;&#22836;&#30340;&#35774;&#22791;&#21517;&#65292;&#22914; <span class="emphasis"><em>sdd</em></span></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
@@ -820,19 +657,10 @@
<li class="listitem">
<p>&#36755;&#20837;&#21629;&#20196;&#65306;# <strong class="userinput"><code>dd if=ISO&#25991;&#20214;&#30340;&#23436;&#25972;&#36335;&#24452; of=/dev/sdX bs=1M</code></strong></p>
-<<<<<<< HEAD
<p>&#20854;&#20013;&#65292;&#8220;X&#8221;&#26159;&#24744;&#30340;&#35774;&#22791;&#21517;&#65288;&#22914;&#65306;/dev/sdc&#65289;</p>
<p>&#31034;&#20363;&#65306;# <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso
-=======
-
-
- <p>&#20854;&#20013;&#65292;&#8220;X&#8221;&#26159;&#24744;&#30340;&#35774;&#22791;&#21517;&#65288;&#22914;&#65306;/dev/sdc&#65289;</p>
-
-
- <p>&#31034;&#20363;&#65306;# <strong class="userinput"><code>dd if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
of=/dev/sdb bs=1M</code></strong></p>
</li>
diff --git a/zh_cn/addUser.html b/zh_cn/addUser.html
index 099ef6c..1c35ddc 100644
--- a/zh_cn/addUser.html
+++ b/zh_cn/addUser.html
@@ -118,17 +118,9 @@
<td align="left" valign="top">
<p>&#22312;&#23433;&#35013; Mageia &#26399;&#38388;&#28155;&#21152;&#30340;&#20219;&#20309;&#29992;&#25143;&#37117;&#23558;&#25317;&#26377;&#35835;/&#20889;&#20445;&#25252;&#30340;&#20027;&#30446;&#24405;&#65288;&#21363; umask=0027&#65289;&#12290;</p>
-<<<<<<< HEAD
<p>&#20320;&#21487;&#20197;&#22312;<span class="emphasis"><em>&#37197;&#32622; - &#27010;&#35201;</em></span>&#19968;&#27493;&#20013;&#28155;&#21152;&#20854;&#20182;&#25152;&#38656;&#29992;&#25143;&#65292;&#21482;&#38656;&#36873;&#25321;<span class="emphasis"><em>&#29992;&#25143;&#31649;&#29702;</em></span>&#21363;&#21487;&#12290;
</p>
-=======
-
-
- <p>&#20320;&#21487;&#20197;&#22312;<span class="emphasis"><em>&#37197;&#32622; - &#27010;&#35201;</em></span>&#19968;&#27493;&#20013;&#28155;&#21152;&#20854;&#20182;&#25152;&#38656;&#29992;&#25143;&#65292;&#21482;&#38656;&#36873;&#25321;<span class="emphasis"><em>&#29992;&#25143;&#31649;&#29702;</em></span>&#21363;&#21487;&#12290;
- </p>
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&#20063;&#21487;&#20197;&#22312;&#23433;&#35013;&#23436;&#25104;&#21518;&#25913;&#21464;&#35775;&#38382;&#26435;&#38480;&#12290;</p>
diff --git a/zh_cn/doPartitionDisks.html b/zh_cn/doPartitionDisks.html
index 950c010..2edc7aa 100644
--- a/zh_cn/doPartitionDisks.html
+++ b/zh_cn/doPartitionDisks.html
@@ -40,8 +40,6 @@
-
-
<p><a name="doPartitionDisks-pa3"></a></p>
<div class="itemizedlist">
<ul class="itemizedlist">
@@ -89,8 +87,6 @@
</p>
-
-
</li>
</ul>
@@ -213,11 +209,6 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/zh_cn/index.html b/zh_cn/index.html
index b25a19b..bf1e7e7 100644
--- a/zh_cn/index.html
+++ b/zh_cn/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">&#31616;&#20171;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">&#20171;&#36136;</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">&#21051;&#24405;&#25110;&#36716;&#20648; ISO</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">&#19979;&#36733;&#21644;&#26816;&#26597;&#23186;&#20171;</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">&#21051;&#24405;&#25110;&#36716;&#20648; ISO</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX&#65292;Mageia &#30340;&#23433;&#35013;&#22120;</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">&#24341;&#23548;&#31243;&#24207;&#30340;&#20027;&#35201;&#36873;&#39033;</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e874">&#24341;&#23548;&#22120;&#30028;&#38754;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e898">&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e912">&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e915">&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e929">&#36873;&#39033;</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e891">&#24341;&#23548;&#22120;&#30028;&#38754;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e921">&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e938">&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e941">&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e958">&#36873;&#39033;</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">&#28155;&#21152;&#25110;&#20462;&#25913;&#24341;&#23548;&#33756;&#21333;&#39033;</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">&#21368;&#36733;Mageia</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1232">&#22914;&#20309;&#20570;</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1262">&#22914;&#20309;&#20570;</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/zh_cn/setupBootloader.html b/zh_cn/setupBootloader.html
index 5384894..08426af 100644
--- a/zh_cn/setupBootloader.html
+++ b/zh_cn/setupBootloader.html
@@ -33,11 +33,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e874"></a>&#24341;&#23548;&#22120;&#30028;&#38754;
-=======
- <h3 class="title"><a name="d5e891"></a>&#24341;&#23548;&#22120;&#30028;&#38754;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -85,11 +81,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e884"></a>GRUB2&#65292;&#24403;&#20351;&#29992;&#20256;&#32479;&#30828;&#20214; + MBR/GPT &#26684;&#24335;&#20998;&#21306;&#26102;
-=======
- <h4 class="title"><a name="d5e901"></a>GRUB2&#65292;&#24403;&#20351;&#29992;&#20256;&#32479;&#30828;&#20214; + MBR/GPT &#26684;&#24335;&#20998;&#21306;&#26102;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -97,11 +89,6 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#25805;&#20316;&#65292;&#35831;&#19981;&#35201;&#20462;&#25913;&#8220;&#24341;&#23548;&#35774;&#22791;&#8221;&#12290;</p>
@@ -113,11 +100,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e890"></a>GRUB2-efi&#65292;&#24403;&#20351;&#29992; UEFI &#30828;&#20214;&#26102;
-=======
- <h4 class="title"><a name="d5e910"></a>GRUB2-efi&#65292;&#24403;&#20351;&#29992; UEFI &#30828;&#20214;&#26102;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -130,23 +113,12 @@
-<<<<<<< HEAD
- <p>&#22914;&#26524; Mageia &#26159;&#24744;&#22312;&#30005;&#33041;&#19978;&#23433;&#35013;&#30340;&#31532;&#19968;&#20010;&#31995;&#32479;&#65292;&#23433;&#35013;&#31243;&#24207;&#23558;&#33258;&#21160;&#21019;&#24314;&#19968;&#20010; ESP&#65288;EFI &#31995;&#32479;&#20998;&#21306;&#65289;&#26469;&#23481;&#32435;&#24341;&#23548;&#22120;&#65288;Grub2-efi&#65289;&#12290;&#22914;&#26524;&#24050;&#23433;&#35013;&#20102;&#20854;&#20182;
- UEFI &#25805;&#20316;&#31995;&#32479;&#65288;&#20363;&#22914; Windows 8&#65289;&#65292;Mageia &#23433;&#35013;&#22120;&#23558;&#20250;&#25506;&#27979;&#29616;&#23384;&#30340;&#65288;&#30001; Windows &#21019;&#24314;&#30340;&#65289; ESP&#65292;&#24182;&#28155;&#21152;
- grub2-efi&#12290;&#23613;&#31649;&#22810;&#20010; ESP &#21487;&#20197;&#20849;&#23384;&#65292;&#20294;&#21482;&#38656;&#19968;&#20010; ESP &#21363;&#21487;&#28385;&#36275;&#21551;&#21160;&#25152;&#26377;&#25805;&#20316;&#31995;&#32479;&#30340;&#38656;&#27714;&#12290;
- </p>
-
-
-=======
-
-
<p>&#22914;&#26524; Mageia &#26159;&#24744;&#22312;&#30005;&#33041;&#19978;&#23433;&#35013;&#30340;&#31532;&#19968;&#20010;&#31995;&#32479;&#65292;&#23433;&#35013;&#31243;&#24207;&#23558;&#33258;&#21160;&#21019;&#24314;&#19968;&#20010; ESP&#65288;EFI &#31995;&#32479;&#20998;&#21306;&#65289;&#26469;&#23481;&#32435;&#24341;&#23548;&#22120;&#65288;Grub2-efi&#65289;&#12290;&#22914;&#26524;&#24050;&#23433;&#35013;&#20102;&#20854;&#20182;
UEFI &#25805;&#20316;&#31995;&#32479;&#65288;&#20363;&#22914; Windows 8&#65289;&#65292;Mageia &#23433;&#35013;&#22120;&#23558;&#20250;&#25506;&#27979;&#29616;&#23384;&#30340;&#65288;&#30001; Windows &#21019;&#24314;&#30340;&#65289; ESP&#65292;&#24182;&#28155;&#21152;
grub2-efi&#12290;&#23613;&#31649;&#22810;&#20010; ESP &#21487;&#20197;&#20849;&#23384;&#65292;&#20294;&#21482;&#38656;&#19968;&#20010; ESP &#21363;&#21487;&#28385;&#36275;&#21551;&#21160;&#25152;&#26377;&#25805;&#20316;&#31995;&#32479;&#30340;&#38656;&#27714;&#12290;
</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&#33509;&#24744;&#19981;&#30830;&#23450;&#22914;&#20309;&#25805;&#20316;&#65292;&#35831;&#19981;&#35201;&#20462;&#25913;&#8220;&#24341;&#23548;&#35774;&#22791;&#8221;&#12290;</p>
</div>
@@ -158,11 +130,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e898"></a>&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;
-=======
- <h3 class="title"><a name="d5e921"></a>&#20351;&#29992; Mageia &#25552;&#20379;&#30340;&#24341;&#23548;&#22120;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -193,11 +161,6 @@
&#36825;&#20040;&#20570;&#65292;&#35831;&#28857;&#20987;<span class="guibutton">&#19979;&#19968;&#27493;</span>&#65292;&#28982;&#21518;&#21462;&#28040;&#21246;&#36873;<span class="guilabel">&#26816;&#27979;&#20854;&#20182;&#25805;&#20316;&#31995;&#32479;</span></p>
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
@@ -206,11 +169,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e912"></a>&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;
-=======
- <h3 class="title"><a name="d5e938"></a>&#20351;&#29992;&#29616;&#23384;&#30340;&#24341;&#23548;&#22120;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -229,11 +188,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e915"></a>&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;
-=======
- <h3 class="title"><a name="d5e941"></a>&#20351;&#29992;&#38142;&#24335;&#21152;&#36733;&#65288;chain loading&#65289;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -249,11 +204,6 @@
-<<<<<<< HEAD
-=======
-
-
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>&#23433;&#35013;&#31243;&#24207;&#23558;&#20250;&#25552;&#37266;&#24744;&#32570;&#23569;&#24341;&#23548;&#22120;&#65292;&#35831;&#24573;&#30053;&#23427;&#24182;&#28857;&#20987;<span class="guibutton">&#30830;&#23450;</span>&#12290;
</p>
@@ -266,11 +216,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e929"></a>&#36873;&#39033;
-=======
- <h3 class="title"><a name="d5e958"></a>&#36873;&#39033;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -282,11 +228,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e931"></a>&#31532;&#19968;&#39029;
-=======
- <h4 class="title"><a name="d5e960"></a>&#31532;&#19968;&#39029;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -329,53 +271,27 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>ACPI&#65288;&#39640;&#32423;&#37197;&#32622;&#19982;&#30005;&#28304;&#25509;&#21475;&#65289;&#26159;&#26631;&#20934;&#30340;&#30005;&#28304;&#31649;&#29702;&#21327;&#35758;&#12290;&#23427;&#21487;&#20197;&#20851;&#38381;&#26410;&#20351;&#29992;&#30340;&#35774;&#22791;&#20197;&#33410;&#33021;&#65292;&#29992;&#20110;&#21462;&#20195; APM&#12290;&#22914;&#26524;&#24744;&#30340;&#30828;&#20214;&#19981;&#20860;&#23481; ACPI&#65292;&#25110;&#32773;&#24744;&#35748;&#20026; ACPI
&#20250;&#36896;&#25104;&#26576;&#20123;&#38382;&#39064;&#65288;&#22914;&#20598;&#23572;&#20250;&#33258;&#21160;&#37325;&#21551;&#65292;&#25110;&#31995;&#32479;&#21345;&#27515;&#65289;&#65292;&#21017;&#21487;&#20197;&#21462;&#28040;&#21246;&#36873;&#23427;&#12290;
-=======
- <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. Uncheck it be
- useful, for example, if your computer does not support ACPI or if you think
- the ACPI implementation might cause some problems (for instance random
- reboots or system lockups).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&#21551;&#29992; SMP</span>&#65306;&#27492;&#36873;&#39033;&#21551;&#29992;&#25110;&#31105;&#29992;&#22810;&#26680;&#22788;&#29702;&#22120;&#19978;&#30340;&#23545;&#31216;&#22810;&#22788;&#29702;&#22120;&#29305;&#24615;&#12290;
-=======
- <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
- multiprocessing for multi core processors.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&#21551;&#29992; APIC</span>&#65306;&#21551;&#29992;&#25110;&#31105;&#29992;&#39640;&#32423;&#21487;&#32534;&#31243;&#20013;&#26029;&#25511;&#21046;&#22120;&#12290;APIC &#35774;&#22791;&#21487;&#20197;&#25903;&#25345;&#26356;&#22797;&#26434;&#30340;&#20248;&#20808;&#32423;&#27169;&#22411;&#21644;&#39640;&#32423;
IRQ&#65288;&#20013;&#26029;&#35831;&#27714;&#65289;&#31649;&#29702;&#21151;&#33021;&#12290;
-=======
- <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.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&#21551;&#29992;&#26412;&#22320; APIC</span>&#65306;&#24744;&#21487;&#20197;&#22312;&#36825;&#37324;&#35774;&#32622;&#26412;&#22320; APIC&#65292;&#29992;&#20110;&#22312; SMP &#31995;&#32479;&#20013;&#31649;&#29702;&#26576;&#20010;&#29305;&#23450;&#22788;&#29702;&#22120;&#30340;&#25152;&#26377;&#22806;&#37096;&#20013;&#26029;&#12290;
-=======
- <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
- manage all external interrupts for some specific processor in an SMP system.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -393,11 +309,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e962"></a>&#19979;&#19968;&#39029;
-=======
- <h4 class="title"><a name="d5e992"></a>&#19979;&#19968;&#39029;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
diff --git a/zh_cn/uninstall-Mageia.html b/zh_cn/uninstall-Mageia.html
index 4b716df..df91667 100644
--- a/zh_cn/uninstall-Mageia.html
+++ b/zh_cn/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1232"></a>&#22914;&#20309;&#20570;
-=======
- <h3 class="title"><a name="d5e1262"></a>&#22914;&#20309;&#20570;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>