diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:50:24 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:50:24 +0200 |
| commit | a979860a232ea8759dc5e6b72074051c9f64b6f8 (patch) | |
| tree | 908282b77f16f0bc3869f2c0daccd42dbccf1cfa | |
| parent | 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 (diff) | |
| download | drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.gz drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.bz2 drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.tar.xz drakx-installer-help-a979860a232ea8759dc5e6b72074051c9f64b6f8.zip | |
Update Catalan files
| -rw-r--r-- | ca/Select-and-use-ISOs.html | 85 | ||||
| -rw-r--r-- | ca/addUser.html | 22 | ||||
| -rw-r--r-- | ca/configureTimezoneUTC.html | 4 | ||||
| -rw-r--r-- | ca/doPartitionDisks.html | 3 | ||||
| -rw-r--r-- | ca/index.html | 12 | ||||
| -rw-r--r-- | ca/setupBootloader.html | 83 | ||||
| -rw-r--r-- | ca/uninstall-Mageia.html | 4 |
7 files changed, 123 insertions, 90 deletions
diff --git a/ca/Select-and-use-ISOs.html b/ca/Select-and-use-ISOs.html index c747f41..88a3008 100644 --- a/ca/Select-and-use-ISOs.html +++ b/ca/Select-and-use-ISOs.html @@ -23,9 +23,7 @@ </div> </div> - - <div class="section" title="Introducció"> <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="Suport"> <div class="titlepage"> @@ -85,7 +78,6 @@ </div> </div> - <div class="section" title="Definició"> <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>Els podeu trobar <a class="ulink" href="http://www.mageia.org/en/downloads/" target="_top">aquí</a>. </p> </div> - <div class="section" title="Suports d'instal·lació clàssics"> <div class="titlepage"> @@ -121,7 +110,6 @@ </div> </div> - <div class="section" title="Característiques comunes"> <div class="titlepage"> @@ -133,7 +121,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -153,7 +140,6 @@ </div> </div> - <div class="section" title="DVD"> <div class="titlepage"> @@ -165,7 +151,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -199,7 +184,6 @@ </div> </div> - <div class="section" title="Mitjà autònom"> <div class="titlepage"> @@ -211,7 +195,6 @@ </div> </div> - <div class="section" title="Característiques comunes"> <div class="titlepage"> @@ -223,7 +206,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -261,7 +243,6 @@ </div> </div> - <div class="section" title="Live DVD Plasma"> <div class="titlepage"> @@ -273,7 +254,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -296,7 +276,6 @@ </div> </div> - <div class="section" title="DVD autònom de GNOME"> <div class="titlepage"> @@ -308,7 +287,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -331,7 +309,6 @@ </div> </div> - <div class="section" title="Live DVD Xfce"> <div class="titlepage"> @@ -343,7 +320,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -368,7 +344,6 @@ </div> </div> - <div class="section" title="Suport CD només d'arrencada"> <div class="titlepage"> @@ -380,7 +355,6 @@ </div> </div> - <div class="section" title="Característiques comunes"> <div class="titlepage"> @@ -392,7 +366,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -428,7 +401,6 @@ </div> </div> - <div class="section" title="netinstall.iso"> <div class="titlepage"> @@ -440,7 +412,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -455,7 +426,6 @@ </div> </div> - <div class="section" title="netinstall-nonfree.iso"> <div class="titlepage"> @@ -467,7 +437,6 @@ </div> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -486,7 +455,6 @@ </div> </div> - <div class="section" title="Baixada i comprovació del mitjà"> <div class="titlepage"> @@ -498,7 +466,6 @@ </div> </div> - <div class="section" title="Baixada"> <div class="titlepage"> @@ -510,29 +477,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="Comprovació de la integritat del suport baixat"> <div class="titlepage"> @@ -544,42 +505,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>Obriu una consola, no cal que sigueu l'usuari primari, i:</p> - + <p>Obriu una consola, no cal que sigueu root, i:</p> <p>- Per a fer servir md5sum, teclegeu: [sam@localhost]$ <strong class="userinput"><code>md5sum camí/cap/a/la/imatge/fitxer.iso</code></strong>. </p> - <p>- Per a fer servir sha1sum, teclegeu [sam@localhost]$ <strong class="userinput"><code>sha1sum camí/cap/a/la/imatge/fitxer.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="Enregistrament o bolcat de l'ISO"> <div class="titlepage"> @@ -591,13 +545,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="Enregistrament de l'ISO a un CD/DVD"> <div class="titlepage"> @@ -609,7 +561,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 @@ -618,7 +569,6 @@ </p> </div> - <div class="section" title="Bolcat de l'ISO a un llapis de memòria USB"> <div class="titlepage"> @@ -630,13 +580,11 @@ </div> </div> - <p>Totes les ISO de Mageia són híbrides, que vol dir que les podeu «bolcar» a un llapis de memòria USB i després fer-lo servir per a arrencar i instal·lar el sistema. </p> - <div class="warning" title="Avís" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -647,7 +595,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> @@ -656,12 +604,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"> @@ -673,12 +619,10 @@ </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"> @@ -690,21 +634,17 @@ </div> </div> - <p>Podeu provar:</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"> @@ -716,7 +656,6 @@ </div> </div> - <div class="warning" title="Avís" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -735,10 +674,8 @@ </tr> </table> </div> - <p>També podeu fer servir l'eina dd en una consola:</p> - <div class="orderedlist"> <ol class="orderedlist" type="1"> @@ -749,16 +686,15 @@ </li> <li class="listitem"> - <p>Convertiu-vos en usuari primari amb l'ordre <strong class="userinput"><code>su -</code></strong> (no - oblideu el «-» final) + <p>Convertiu-vos en root amb l'ordre <strong class="userinput"><code>su -</code></strong> (no oblideu el + «-» 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> @@ -766,15 +702,12 @@ <li class="listitem"> <p>Introduïu l'ordre <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 @@ -805,10 +738,8 @@ <p>Introduïu l'ordre: # <strong class="userinput"><code>dd if=camí/al/fitxer/ISO of=/dev/sdX bs=1M</code></strong></p> - <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 of=/dev/sdb bs=1M</code></strong></p> diff --git a/ca/addUser.html b/ca/addUser.html index 83bdfbd..b53ddef 100644 --- a/ca/addUser.html +++ b/ca/addUser.html @@ -23,11 +23,16 @@ </div> </div> +<<<<<<< HEAD + + +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 <div class="section" title="Estableix la contrasenya d'administrador (root):"> <div class="titlepage"> @@ -39,7 +44,6 @@ </div> </div> - <p>Per a qualsevol instal·lació de <span class="application">Mageia</span> és aconsellable que establiu una contrasenya de superusuari o administrador, @@ -50,7 +54,6 @@ repetir la mateixa contrasenya a la casella de sota, per a comprovar per comparació que no heu teclejat malament la primera contrasenya. </p> - <div class="note" title="Nota" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -72,7 +75,6 @@ </div> </div> - <div class="section" title="Introduïu un usuari"> <div class="titlepage"> @@ -84,14 +86,12 @@ </div> </div> - <p>Afegiu aquí un usuari. Un usuari té menys permisos que el superusuari (root), però prou per a navegar per Internet, fer servir aplicacions ofimàtiques o jugar, i fer qualsevol altra cosa que un usuari mitjà fa amb el seu ordinador. </p> - <div class="itemizedlist"> <ul class="itemizedlist"> @@ -133,7 +133,6 @@ </li> </ul> </div> - <div class="note" title="Nota" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Note"> @@ -147,13 +146,19 @@ <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és també es poden modificar després de la instal·lació.</p> @@ -163,7 +168,6 @@ </div> </div> - <div class="section" title="Gestió avançada d'usuaris"> <div class="titlepage"> @@ -175,15 +179,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> - <p>Additionally, you can disable or enable a guest account.</p> - <div class="warning" title="Avís" style="margin-left: 0.5in; margin-right: 0.5in;"> <table border="0" summary="Warning"> @@ -204,7 +205,6 @@ </tr> </table> </div> - <div class="itemizedlist"> <ul class="itemizedlist"> diff --git a/ca/configureTimezoneUTC.html b/ca/configureTimezoneUTC.html index 27e610d..603363e 100644 --- a/ca/configureTimezoneUTC.html +++ b/ca/configureTimezoneUTC.html @@ -31,8 +31,8 @@ - <p><a name="configureTimezoneUTC-pa1"></a>Trieu el fus horari escollint un país o bé una ciutat propera en el mateix - fus horari. + <p><a name="configureTimezoneUTC-pa1"></a>Trieu la zona horària escollint un país o bé una ciutat propera a la mateixa + zona horària. </p> diff --git a/ca/doPartitionDisks.html b/ca/doPartitionDisks.html index 1b504a8..04249d6 100644 --- a/ca/doPartitionDisks.html +++ b/ca/doPartitionDisks.html @@ -245,8 +245,11 @@ +<<<<<<< HEAD +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </td> </tr> diff --git a/ca/index.html b/ca/index.html index 258461c..42a49cc 100644 --- a/ca/index.html +++ b/ca/index.html @@ -75,11 +75,19 @@ <dt><span class="section"><a href="setupBootloader.html">Opcions principals del menú 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">Ús del gestor d'arrencada de Mageia</a></span></dt> + <dt><span class="section"><a href="setupBootloader.html#d5e924">Ú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">Ús del gestor d'arrencada de Mageia</a></span></dt> <dt><span class="section"><a href="setupBootloader.html#d5e947">Ú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 </dl> </dd> <dt><span class="section"><a href="setupBootloaderAddEntry.html">Addició o modificació d'una entrada al menú d'arrencada</a></span></dt> @@ -113,7 +121,11 @@ <dt><span class="section"><a href="uninstall-Mageia.html">Desinstal·lació 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 </dl> </dd> </dl> diff --git a/ca/setupBootloader.html b/ca/setupBootloader.html index a1ba4ad..fcdde84 100644 --- a/ca/setupBootloader.html +++ b/ca/setupBootloader.html @@ -33,7 +33,11 @@ <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> </div> </div> @@ -81,7 +85,11 @@ <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> </div> </div> @@ -89,11 +97,17 @@ +<<<<<<< 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> @@ -102,7 +116,11 @@ <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> </div> </div> @@ -117,6 +135,19 @@ +<<<<<<< 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 + 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 you really know what you are doing.</p> +======= <p>If Mageia is the first system installed on your computer, the installer @@ -130,6 +161,7 @@ <p>Don't modify the "Boot Device" unless really knowing what you do.</p> +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -140,7 +172,11 @@ <div class="titlepage"> <div> <div> +<<<<<<< HEAD + <h3 class="title"><a name="d5e910"></a>Ús del gestor d'arrencada de Mageia +======= <h3 class="title"><a name="d5e930"></a>Ús del gestor d'arrencada de Mageia +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -175,8 +211,11 @@ <span class="guilabel">Probe Foreign OS</span></p> +<<<<<<< HEAD +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </div> @@ -185,7 +224,11 @@ <div class="titlepage"> <div> <div> +<<<<<<< HEAD + <h3 class="title"><a name="d5e924"></a>Ús d'un gestor d'arrencada existent +======= <h3 class="title"><a name="d5e947"></a>Ús d'un gestor d'arrencada existent +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -203,11 +246,19 @@ </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> </div> </div> @@ -215,7 +266,11 @@ +<<<<<<< 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>. @@ -224,10 +279,15 @@ +<<<<<<< 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> @@ -239,7 +299,11 @@ <div class="titlepage"> <div> <div> +<<<<<<< HEAD + <h3 class="title"><a name="d5e941"></a>Opcions +======= <h3 class="title"><a name="d5e967"></a>Opcions +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> @@ -251,7 +315,11 @@ <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> </div> </div> @@ -302,10 +370,17 @@ <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> @@ -328,7 +403,11 @@ <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> @@ -346,7 +425,11 @@ <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> </div> </div> diff --git a/ca/uninstall-Mageia.html b/ca/uninstall-Mageia.html index 166de5f..7e4d71f 100644 --- a/ca/uninstall-Mageia.html +++ b/ca/uninstall-Mageia.html @@ -31,7 +31,11 @@ <div class="titlepage"> <div> <div> +<<<<<<< HEAD + <h3 class="title"><a name="d5e1247"></a>Howto +======= <h3 class="title"><a name="d5e1273"></a>Howto +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </h3> </div> </div> |