aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ca/Select-and-use-ISOs.html137
-rw-r--r--ca/exitInstall.html3
-rw-r--r--ca/index.html11
-rw-r--r--ca/installer.html4
-rw-r--r--ca/setupBootloaderAddEntry.html35
-rw-r--r--ca/uninstall-Mageia.html80
6 files changed, 192 insertions, 78 deletions
diff --git a/ca/Select-and-use-ISOs.html b/ca/Select-and-use-ISOs.html
index e330050..d7a7eed 100644
--- a/ca/Select-and-use-ISOs.html
+++ b/ca/Select-and-use-ISOs.html
@@ -50,8 +50,9 @@
- <p>We call a media here a ISO image file that allows to install and/or update
- Mageia and by extension any physical support where the ISO file is copied.
+ <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>
@@ -89,7 +90,7 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>They use the traditional installer called drakx.</p>
+ <p>These ISOs use the traditional installer called drakx.</p>
</li>
<li class="listitem">
@@ -131,14 +132,12 @@
</li>
<li class="listitem">
- <p>Each DVD contains any available desktop environments and languages.</p>
+ <p>Each DVD contains many available desktop environments and languages.</p>
</li>
<li class="listitem">
- <p>You'll be given the choice during the installation to add or not non free
- software.
- </p>
+ <p>You'll be given the choice during the installation to add non free software.</p>
</li>
</ul>
@@ -163,20 +162,20 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Both architectures are present on the same media, the choice is made
+ <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>Xfce desktop only.</p>
+ <p>Uses Xfce desktop only.</p>
</li>
<li class="listitem">
- <p>Some languages only (be, bg, ca, de, en, es, fr, it, mk, pl, pt, ru, sv, uk)
- TO BE CHECKED!
+ <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>
@@ -221,19 +220,20 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Can be used to preview the distribution without first installing it on a
- HDD, and optionally install Mageia on your HDD.
+ <p>Can be used to preview the distribution without installing it on a HDD, and
+ optionally install Mageia on to your HDD.
+
</p>
</li>
<li class="listitem">
- <p>ISO contains only one desktop environment (KDE or GNOME).</p>
+ <p>Each ISO contains only one desktop environment (KDE or GNOME).</p>
</li>
<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">
@@ -245,7 +245,7 @@
</li>
<li class="listitem">
- <p>They contains non free software.</p>
+ <p>They contain non free software.</p>
</li>
</ul>
@@ -280,7 +280,7 @@
</li>
<li class="listitem">
- <p>32 bits only.</p>
+ <p>32 bit only.</p>
</li>
</ul>
@@ -315,7 +315,7 @@
</li>
<li class="listitem">
- <p>32 bits only.</p>
+ <p>32 bit only.</p>
</li>
</ul>
@@ -350,7 +350,7 @@
</li>
<li class="listitem">
- <p>Different media for architecture 32 or 64 bits.</p>
+ <p>Different media for 32 or 64 bit architectures.</p>
</li>
</ul>
@@ -385,7 +385,7 @@
</li>
<li class="listitem">
- <p>Different media for architecture 32 or 64 bits.</p>
+ <p>Different media for 32 or 64 bit architectures.</p>
</li>
</ul>
@@ -396,11 +396,11 @@
</div>
- <div class="section" title="Boot-only CDs media">
+ <div class="section" title="Boot-only CD media">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e109"></a>Boot-only CDs media
+ <h4 class="title"><a name="d5e109"></a>Boot-only CD media
</h4>
</div>
</div>
@@ -425,23 +425,24 @@
<li class="listitem">
<p>Each one is a small image that contains no more than that which is needed to
- start the drakx installer and find the ISO file to continue and complete the
- install. These ISO files may be on the PC hard disk, on a local drive, on a
- local network or on the Internet.
+ start the drakx installer and find drakx-installer-stage2 and other packages
+ that are needed to continue and complete the install. These packages may be
+ on the PC hard disk, on a local drive, on a local network or on the
+ Internet.
</p>
</li>
<li class="listitem">
- <p>These media are very light (less than 100 Mo) and are convenient when
- bandwidth is too low to download a full DVD, PC without DVD drive or PC that
- can't boot on a USB stick.
+ <p>These media are very light (less than 100 MB) and are convenient when
+ bandwidth is too low to download a full DVD, a PC without a DVD drive or a
+ PC that can't boot from a USB stick.
</p>
</li>
<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">
@@ -471,7 +472,9 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Contains only free software, for people who refuse non free software.</p>
+ <p>Contains only free software, for those people who refuse to use non-free
+ software.
+ </p>
</li>
</ul>
@@ -496,7 +499,7 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>Contains non free software (mostly drivers, codecs...) for people who need
+ <p>Contains non-free software (mostly drivers, codecs...) for people who need
it.
</p>
@@ -511,11 +514,11 @@
</div>
- <div class="section" title="Media downloading and checking">
+ <div class="section" title="Downloading and Checking Media">
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e132"></a>Media downloading and checking
+ <h3 class="title"><a name="d5e132"></a>Downloading and Checking Media
</h3>
</div>
</div>
@@ -535,21 +538,22 @@
- <p>Once you have chosen your ISO file, you can download it either using http or
- BitTorrent. In both cases, a window give you some information, like the used
- mirror and the possibility to change if the bandwidth is to low. If http is
- chosen, you can also see something like
+ <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 your ISO integrity. Use only one of
+ <p>md5sum and sha1sum are tools to check the ISO integrity. Use only one of
them. Both hexadecimal numbers have been calculated by an algorithm from the
- file to be downloaded. If you ask this algorithm to calculate again this
+ 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 met a
- failure. Then this window appears:
+ downloaded file is correct, or the number is different and you have a
+ failure. A failure infers that you should retry the download.Then this
+ window appears:
</p>
@@ -611,17 +615,17 @@
- <p>The checked ISO can now be burned on a CD or DVD or dumped on a USB
- stick. These operations are not a simple copy and aim at make a boot-able
- media.
+ <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>
- <div class="section" title="Burn the ISO on a CD/DVD">
+ <div class="section" title="Burning the ISO to a CD/DVD">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e160"></a>Burn the ISO on a CD/DVD
+ <h4 class="title"><a name="d5e160"></a>Burning the ISO to a CD/DVD
</h4>
</div>
</div>
@@ -629,20 +633,20 @@
- <p>Use whatever burner you want but ensure the burning device is set correctly
+ <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
- correct. More information in <a class="ulink" href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images" target="_top">the Mageia
+ correct. There is more information in <a class="ulink" href="https://wiki.mageia.org/en/Writing_CD_and_DVD_images" target="_top">the Mageia
wiki</a>.
</p>
</div>
- <div class="section" title="Dump the ISO on a USB stick">
+ <div class="section" title="Dump the ISO to a USB stick">
<div class="titlepage">
<div>
<div>
- <h4 class="title"><a name="d5e165"></a>Dump the ISO on a USB stick
+ <h4 class="title"><a name="d5e165"></a>Dump the ISO to a USB stick
</h4>
</div>
</div>
@@ -650,8 +654,8 @@
- <p>All Mageia ISOs are hybrid, which means you can 'dump' them on a USB stick
- and use it to boot and install the system.
+ <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>
@@ -664,9 +668,9 @@
<tr>
<td align="left" valign="top">
- <p>"dumping" an image onto a flash device destroys any prior file-system in the
- partition; any data will be lost and partition capacity will be reduced to
- the image size.
+ <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>
</td>
@@ -675,7 +679,7 @@
</div>
- <p>To recover the original capacity, you have to format the USB stick.</p>
+ <p>To recover the original capacity, you must re-format the USB stick.</p>
<div class="section" title="Using Mageia">
@@ -706,7 +710,7 @@
<li class="listitem">
<p>Become root with the command <strong class="userinput"><code>su -</code></strong> (don't forget the
- final -)
+ final '-' )
</p>
@@ -714,8 +718,8 @@
</li>
<li class="listitem">
- <p>Plug your USB stick (do not mount it, that means do not open any application
- or file manager that read it)
+ <p>Plug 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>
</li>
@@ -739,9 +743,10 @@
bs=1M</code></strong></p>
- <p>(x)=your device name eg: /dev/sdc Example: # <strong class="userinput"><code>dd
- if=/home/user/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb
- 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>
</li>
<li class="listitem">
@@ -764,7 +769,7 @@
<div class="titlepage">
<div>
<div>
- <h5 class="title"><a name="d5e205"></a>Using Windows
+ <h5 class="title"><a name="d5e206"></a>Using Windows
</h5>
</div>
</div>
@@ -772,7 +777,7 @@
- <p>You can try:</p>
+ <p>You could try:</p>
<p>- <a class="ulink" href="http://rufus.akeo.ie/?locale=en_US" target="_top">Rufus</a></p>
@@ -795,7 +800,7 @@
<div class="titlepage">
<div>
<div>
- <h3 class="title"><a name="d5e213"></a>Mageia Installation
+ <h3 class="title"><a name="d5e214"></a>Mageia Installation
</h3>
</div>
</div>
@@ -808,7 +813,7 @@
</p>
- <p>More information, is available in <a class="ulink" href="https://wiki.mageia.org/en/Category:Documentation" target="_top">the Mageia
+ <p>More information is available in <a class="ulink" href="https://wiki.mageia.org/en/Category:Documentation" target="_top">the Mageia
wiki</a>.
</p>
diff --git a/ca/exitInstall.html b/ca/exitInstall.html
index c479496..079b521 100644
--- a/ca/exitInstall.html
+++ b/ca/exitInstall.html
@@ -6,7 +6,8 @@
<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="installUpdates.html" title="Actualitzacions"><style xmlns="http://www.w3.org/TR/xhtml1/transitional" type="text/css">
+ <link rel="prev" href="installUpdates.html" title="Actualitzacions">
+ <link rel="next" href="uninstall-Mageia.html" title="Uninstalling Mageia"><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/index.html b/ca/index.html
index 9c1f42a..fcb34c8 100644
--- a/ca/index.html
+++ b/ca/index.html
@@ -27,9 +27,9 @@
<dd>
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Media</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e132">Media downloading and checking</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e132">Downloading and Checking Media</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e157">Burn or dump the ISO</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e213">Mageia Installation</a></span></dt>
+ <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e214">Mageia Installation</a></span></dt>
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, l'instal&middot;lador de Mageia</a></span></dt>
@@ -108,6 +108,12 @@
<dt><span class="section"><a href="securityLevel.html">Nivell de seguretat</a></span></dt>
<dt><span class="section"><a href="installUpdates.html">Actualitzacions</a></span></dt>
<dt><span class="section"><a href="exitInstall.html">Enhorabona</a></span></dt>
+ <dt><span class="section"><a href="uninstall-Mageia.html">Uninstalling Mageia</a></span></dt>
+ <dd>
+ <dl>
+ <dt><span class="section"><a href="uninstall-Mageia.html#d5e1120">Howto</a></span></dt>
+ </dl>
+ </dd>
</dl>
</div>
@@ -210,7 +216,6 @@
-
</div>
</body>
</html>
diff --git a/ca/installer.html b/ca/installer.html
index ca38da4..4f9ec3f 100644
--- a/ca/installer.html
+++ b/ca/installer.html
@@ -53,7 +53,9 @@
- <p>From this first screen, it is possible to set some personal preferences:</p>
+ <p>A partir d'aquesta primera pantalla, &eacute;s possible establir algunes
+ prefer&egrave;ncies personals:
+ </p>
<div class="itemizedlist">
diff --git a/ca/setupBootloaderAddEntry.html b/ca/setupBootloaderAddEntry.html
index a6835e2..b79bbc1 100644
--- a/ca/setupBootloaderAddEntry.html
+++ b/ca/setupBootloaderAddEntry.html
@@ -22,13 +22,10 @@
</div>
</div>
</div>
-
-
-
-
-
+
+
<p>Podeu afegir una entrada o modificar la que heu triat, prement el bot&oacute;
adequat a la pantalla de <span class="emphasis"><em>Configuraci&oacute; de l'arrencada</em></span> i
@@ -36,21 +33,44 @@
</p>
-
+ <div class="note" title="Nota" 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="[Nota]" 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>Algunes coses que es poden fer sense perill s&oacute;n canviar l'etiqueta d'una
entrada i marcar la casella per a fer-la predeterminada.
</p>
+
<p>Podeu afegir el n&uacute;mero de versi&oacute; d'una entrada, o b&eacute; reanomenar-la
completament.
</p>
+
<p>L'entrada predeterminada &eacute;s aquella que es far&agrave; servir si no es fa cap
selecci&oacute; mentre el sistema est&agrave; arrencant.
</p>
+
<div class="warning" title="Av&iacute;s" style="margin-left: 0.5in; margin-right: 0.5in;">
<table border="0" summary="Warning">
<tr>
@@ -59,15 +79,16 @@
</tr>
<tr>
<td align="left" valign="top">
+
<p>L'edici&oacute; d'altres coses us pot deixar amb un sistema que no pot arrencar. No
proveu altres coses si no sabeu qu&egrave; esteu fent.
</p>
+
</td>
</tr>
</table>
</div>
-
</div>
</body>
</html>
diff --git a/ca/uninstall-Mageia.html b/ca/uninstall-Mageia.html
new file mode 100644
index 0000000..ad41265
--- /dev/null
+++ b/ca/uninstall-Mageia.html
@@ -0,0 +1,80 @@
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+
+ <title>Uninstalling Mageia</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">
+ <link rel="prev" href="exitInstall.html" title="Enhorabona"><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 }
+ --></style></head>
+ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
+ <div lang="ca" class="section" title="Uninstalling Mageia">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h2 class="title"><a name="uninstall-Mageia"></a>Uninstalling Mageia
+ </h2>
+ </div>
+ </div>
+ </div>
+
+
+
+
+
+
+ <div class="section" title="Howto">
+ <div class="titlepage">
+ <div>
+ <div>
+ <h3 class="title"><a name="d5e1120"></a>Howto
+ </h3>
+ </div>
+ </div>
+ </div>
+
+
+
+ <p>If Mageia didn't convince you or you can't install it correctly, in short
+ you want get rid of it. That is your right and Mageia also gives you the
+ possibility to uninstall. This is not true for every operating system.
+ </p>
+
+
+ <p>After your data backup, reboot your installation Mageia DVD and select
+ Rescue system, then, Restore Windows boot loader. At the next boot, you will
+ only have Windows with no option to choose your operating system.
+ </p>
+
+
+ <p>To recover the space used by Mageia partitions on Windows, click on
+ <code class="code">Start -&gt; Control Panel -&gt; Administrative Tools -&gt; Computer Management
+ -&gt; Storage -&gt; Disk Management</code> to access to the partition
+ management. You will recognize the Mageia partition because they are labeled
+ <span class="guilabel">Unknown</span>, and also by their size and place in the
+ disk. Right click on each of these partitions and select
+ <span class="guibutton">Delete</span>. The space will be freed.
+ </p>
+
+
+ <p>If you are using Windows XP, you can create a new partition and format it
+ (FAT32 or NTFS). It will get a partition letter.
+ </p>
+
+
+ <p>If you have Vista or 7, you have one more possibility, you can extend the
+ existing partition that is at the left of the freed space. There are other
+ partitioning tools that can be used, such as gparted, available for both
+ windows and linux. As always, when changing partitions, be very careful, and
+ make sure all important things have been backed up.
+ </p>
+
+ </div>
+
+ </div>
+ </body>
+</html>