diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-25 18:38:09 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-25 18:38:09 +0200 |
| commit | 984a084705f358bc9799d634eb81427e81982051 (patch) | |
| tree | 73c16dffc5c3134cdf85a94c26c8564b972789e1 /eu/Select-and-use-ISOs.html | |
| parent | c26420407d1f1a586b943c41977152969c5eec0c (diff) | |
| download | drakx-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 'eu/Select-and-use-ISOs.html')
| -rw-r--r-- | eu/Select-and-use-ISOs.html | 19 |
1 files changed, 0 insertions, 19 deletions
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 |