aboutsummaryrefslogtreecommitdiffstats
path: root/ca
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /ca
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'ca')
-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
11 files changed, 76 insertions, 224 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>