From a979860a232ea8759dc5e6b72074051c9f64b6f8 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Tue, 6 Jun 2017 07:50:24 +0200 Subject: Update Catalan files --- ca/Select-and-use-ISOs.html | 85 +++++--------------------------------------- ca/addUser.html | 22 ++++++------ ca/configureTimezoneUTC.html | 4 +-- ca/doPartitionDisks.html | 3 ++ ca/index.html | 12 +++++++ ca/setupBootloader.html | 83 ++++++++++++++++++++++++++++++++++++++++++ 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 @@ - -
@@ -37,15 +35,12 @@
-

Mageia is distributed via ISO images. This page will help you to choose which image match your needs.

-

There is two families of media:

-
-

Details are given in the next sections.

-
@@ -85,7 +78,6 @@
-
@@ -97,19 +89,16 @@
-

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.

-

Els podeu trobar aquí.

-
@@ -121,7 +110,6 @@
-
@@ -133,7 +121,6 @@
-
-
@@ -165,7 +151,6 @@
-
-
@@ -211,7 +195,6 @@
-
@@ -223,7 +206,6 @@
-
-
@@ -273,7 +254,6 @@
-
-
@@ -308,7 +287,6 @@
-
-
@@ -343,7 +320,6 @@
-
-
@@ -380,7 +355,6 @@
-
@@ -392,7 +366,6 @@
-
-
@@ -440,7 +412,6 @@
-
-
@@ -467,7 +437,6 @@
-
-
@@ -498,7 +466,6 @@
-
@@ -510,29 +477,23 @@
-

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

- -

md5sum and sha1sum are tools to check the ISO integrity. Use only one of them. Keep one of them for further usage. Then this window appears:

- -

Check the radio button Save File.

-
@@ -544,42 +505,35 @@
-

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.

- -

Obriu una consola, no cal que sigueu l'usuari primari, i:

- +

Obriu una consola, no cal que sigueu root, i:

- Per a fer servir md5sum, teclegeu: [sam@localhost]$ md5sum camí/cap/a/la/imatge/fitxer.iso.

-

- Per a fer servir sha1sum, teclegeu [sam@localhost]$ sha1sum camí/cap/a/la/imatge/fitxer.iso.

-

and compare the obtained number on your computer (you may have to wait for a while) with the number given by Mageia. Example:

- -

-
@@ -591,13 +545,11 @@
-

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.

-
@@ -609,7 +561,6 @@
-

Use whatever burner you wish but ensure the burning device is set correctly to burn an image, burn data or files is not @@ -618,7 +569,6 @@

-
@@ -630,13 +580,11 @@
-

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.

-
@@ -647,7 +595,7 @@
-

"dumping" an image onto a flash device destroys any previous file-system on +

"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.

@@ -656,12 +604,10 @@
-

To recover the original capacity, you must redo partitioning and re-format the USB stick.

-
@@ -673,12 +619,10 @@
-

You can use a graphical tool like IsoDumper

-
@@ -690,21 +634,17 @@
-

Podeu provar:

-

- Rufus using the "ISO image" option;

-

- Win32 Disk Imager

-
@@ -716,7 +656,6 @@
-
@@ -735,10 +674,8 @@
-

També podeu fer servir l'eina dd en una consola:

-
    @@ -749,16 +686,15 @@
  1. -

    Convertiu-vos en usuari primari amb l'ordre su - (no - oblideu el «-» final) +

    Convertiu-vos en root amb l'ordre su - (no oblideu el + «-» final)

    -
  2. -

    Plug your USB stick (do not mount it, this also means do not open any +

    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)

    @@ -766,15 +702,12 @@

  3. Introduïu l'ordre fdisk -l

    - -

    Alternatively, you can get the device name with the command dmesg: at end, you see the device name starting with sd, and sdd in this case:

    - 
    [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 @@
                                        
                            
    Introduïu l'ordre: # dd if=camí/al/fitxer/ISO of=/dev/sdX
                                     bs=1M
    
-                           
                                        
                            
    On X=nom del dispositiu, per exemple: /dev/sdc
    
-                           
                                        
                            
    Exemple: # dd if=/home/usuari/Baixades/Mageia-4-x86_64-DVD.iso
                                     of=/dev/sdb bs=1M
    
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 @@
+<<<<<<< HEAD + + +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -39,7 +44,6 @@
-

Per a qualsevol instal·lació de Mageia é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.

-
@@ -72,7 +75,6 @@ -
@@ -84,14 +86,12 @@
-

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.

-
    @@ -133,7 +133,6 @@
-
@@ -147,13 +146,19 @@

Any user you add while installing Mageia, will have a both read and write protected home directory (umask=0027).

+<<<<<<< HEAD +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

You can add all extra needed users in the Configuration - Summary step during the install. Choose User management.

+<<<<<<< HEAD +======= +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

Els permisos d'accés també es poden modificar després de la instal·lació.

@@ -163,7 +168,6 @@ -
@@ -175,15 +179,12 @@
-

If the advanced button is clicked you are offered a screen that allows you to edit the settings for the user you are adding.

-

Additionally, you can disable or enable a guest account.

-
@@ -204,7 +205,6 @@
-